diff options
author | Peter Simons <simons@cryp.to> | 2017-09-05 11:14:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-05 11:14:57 +0200 |
commit | 1357268b9078b761a4de1e2cd76be1a87d229120 (patch) | |
tree | 37b18561817c1e38dfeb76a8b954b9eb2c807fe6 /pkgs/development | |
parent | b80c3646c2daa663e5d6ede740935ecea1809691 (diff) | |
parent | 19de1f537e377dbc314b3902e624439204f74f62 (diff) | |
download | nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.tar nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.tar.gz nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.tar.bz2 nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.tar.lz nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.tar.xz nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.tar.zst nixpkgs-1357268b9078b761a4de1e2cd76be1a87d229120.zip |
Merge pull request #28478 from obsidiansystems/haskell-custom-stdenv
haskell infra: Make sure packages get custom stdenv
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 562042721e7..444a4899a04 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -92,7 +92,7 @@ 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; |