gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chickenPackages_{4,5}.eggDerivation: move env variables into env (#491384)

Browse Source
This commit is contained in:
Jo
2026-02-19 12:33:49 +00:00
committed by GitHub
parent dfd1965ec6 bdf6477108
commit 9b3265131a
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/chicken/4/eggDerivation.nix
+6 -3
View File
@@ -26,10 +26,13 @@ stdenv.mkDerivation (
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ chicken ];
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
env = {
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
CHICKEN_REPOSITORY = libPath;
CHICKEN_INSTALL_PREFIX = "$out";
CHICKEN_REPOSITORY = libPath;
CHICKEN_INSTALL_PREFIX = "$out";
}
// (args.env or { });
installPhase = ''
runHook preInstall
pkgs/development/compilers/chicken/5/eggDerivation.nix
+4 -1
View File
@@ -41,7 +41,10 @@ in
strictDeps = true;
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
env = {
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
}
// (args.env or { });
buildPhase = ''
runHook preBuild
pkgs/development/compilers/chicken/5/overrides.nix
+1 -1
View File
@@ -24,7 +24,7 @@ let
broken = addMetaAttrs { broken = true; };
brokenOnDarwin = addMetaAttrs { broken = stdenv.hostPlatform.isDarwin; };
addToCscOptions = opt: old: {
CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt);
env.CSC_OPTIONS = lib.concatStringsSep " " ([ old.env.CSC_OPTIONS or "" ] ++ lib.toList opt);
};
in
{