diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-08-22 15:17:12 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-08-22 16:00:21 -0400 |
commit | 19de1f537e377dbc314b3902e624439204f74f62 (patch) | |
tree | 30c2df99304556c6f6505ebe94e8630e81bc0786 /pkgs/development | |
parent | e619ace733fee725da5a1b84e5cce68d610ba35e (diff) | |
download | nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.tar nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.tar.gz nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.tar.bz2 nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.tar.lz nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.tar.xz nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.tar.zst nixpkgs-19de1f537e377dbc314b3902e624439204f74f62.zip |
haskell infra: Make sure packages get custom stdenv
One of the goals of 74f5fe5 was to allow passing in a custom stdenv, which would be used for genericBuilder's `mkDerivation` call. That does work, but if packages takes `stdenv` as an parameter for any reason, they'll get the default one instead. This change remedies it.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 87f3a04ebf5..a8672f2e967 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -89,7 +89,7 @@ self: let }; in stdenv.lib.makeOverridable drvScope (auto // manualArgs); - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; |