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. (cherry picked from commit 19de1f5)
NixOS · Sep 5, 2017 · 1360efe · 1360efe
1 parent 8b517eb
commit 1360efe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;