Fix build-release-notes being required
This commit is contained in:
parent
fbc1c1c4da
commit
08ed89703c
11
overlay.nix
11
overlay.nix
|
@ -19,14 +19,21 @@ let
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
lixFunctionArgs = builtins.functionArgs (import (lix + "/package.nix"));
|
||||||
|
# fix up build-release-notes being required in older versions of Lix.
|
||||||
|
lixPackageBuildReleaseNotes =
|
||||||
|
if lixFunctionArgs.build-release-notes or true
|
||||||
|
then { }
|
||||||
|
else { build-release-notes = null; };
|
||||||
|
|
||||||
# This is kind of scary to not override the nix version to pretend to be
|
# This is kind of scary to not override the nix version to pretend to be
|
||||||
# 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI
|
# 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI
|
||||||
# usage.
|
# usage.
|
||||||
# https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121
|
# https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121
|
||||||
lixPkg = (final.callPackage (lix + "/package.nix") {
|
lixPkg = final.callPackage (lix + "/package.nix") ({
|
||||||
versionSuffix = "-lix${versionSuffix}";
|
versionSuffix = "-lix${versionSuffix}";
|
||||||
boehmgc-nix = boehmgc-patched;
|
boehmgc-nix = boehmgc-patched;
|
||||||
});
|
} // lixPackageBuildReleaseNotes);
|
||||||
|
|
||||||
# These packages depend on Nix features that Lix does not support
|
# These packages depend on Nix features that Lix does not support
|
||||||
overridelist_2_18 = [
|
overridelist_2_18 = [
|
||||||
|
|
Loading…
Reference in a new issue