JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28478 from obsidiansystems/haskell-custom-stdenv

Browse Source 
haskell infra: Make sure packages get custom stdenv
This commit is contained in:
Peter Simons 2017-09-05 11:14:57 +02:00 committed by GitHub
commit 1357268b90
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -92,7 +92,7 @@ let
}; };
in stdenv.lib.makeOverridable drvScope (auto // manualArgs); 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; defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args; callPackage = drv: args: callPackageWithScope defaultScope drv args;