From 08ed89703c3d055b9e70bb347626cc9da5c6cfe3 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Thu, 16 May 2024 12:40:59 +0000 Subject: [PATCH] Fix build-release-notes being required --- overlay.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/overlay.nix b/overlay.nix index 40bb9d4..b9b2155 100644 --- a/overlay.nix +++ b/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 # 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI # usage. # 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}"; boehmgc-nix = boehmgc-patched; - }); + } // lixPackageBuildReleaseNotes); # These packages depend on Nix features that Lix does not support overridelist_2_18 = [