diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-08 13:22:13 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-05-18 18:04:36 +0200 |
| commit | 807146cf751976103724a612ed369eb86cf7a3c7 (patch) | |
| tree | 1ee31f1bd27d0c443a1b12b019e0c6d5ab311adc /pkgs/development/haskell-modules/default.nix | |
| parent | a14966e8271aa0a2b958ff9723524157dfc3ccd2 (diff) | |
| download | nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.tar nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.tar.gz nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.tar.bz2 nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.tar.lz nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.tar.xz nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.tar.zst nixpkgs-807146cf751976103724a612ed369eb86cf7a3c7.zip | |
haskell-ng: make overrideScope respect the default lookup scope
Build environments created by overrideScope lost the ability to find packages outside of the Haskell package set without help. This patch remedies this issue. Fixes https://github.com/NixOS/nixpkgs/issues/6192.
Diffstat (limited to 'pkgs/development/haskell-modules/default.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index e4e077def96..6bfe92e4338 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -42,11 +42,11 @@ let }); callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // { - overrideScope = f: callPackageWithScope (fix (extend scope.__unfix__ f)) drv args; + overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - defaultScope = pkgs // pkgs.xlibs // pkgs.gnome // self; - callPackage = drv: args: callPackageWithScope defaultScope drv args; + mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + callPackage = drv: args: callPackageWithScope (mkScope self) drv args; in import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // { |