Unverified Commit 9b326513 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

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

parents dfd1965e bdf64771

pkgs/development/compilers/chicken/4/eggDerivation.nix

+6 −3
Original line number Diff line number Diff line
@@ -26,10 +26,13 @@ stdenv.mkDerivation ( 
    nativeBuildInputs = [ makeWrapper ];

    buildInputs = [ chicken ];



    env = {

      CSC_OPTIONS = lib.concatStringsSep " " cscOptions;



      CHICKEN_REPOSITORY = libPath;

      CHICKEN_INSTALL_PREFIX = "$out";

    }

    // (args.env or { });



    installPhase = ''

      runHook preInstall

pkgs/development/compilers/chicken/5/eggDerivation.nix

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ in 


    strictDeps = true;



    env = {

      CSC_OPTIONS = lib.concatStringsSep " " cscOptions;

    }

    // (args.env or { });



    buildPhase = ''

      runHook preBuild

pkgs/development/compilers/chicken/5/overrides.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

{