From 19de1f537e377dbc314b3902e624439204f74f62 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 22 Aug 2017 15:17:12 -0400 Subject: [PATCH] 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. --- pkgs/development/haskell-modules/make-package-set.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 87f3a04ebf57..a8672f2e9677 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;