diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2017-09-12 17:30:35 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2017-09-12 17:30:35 -0400 |
| commit | dbd500937644c2deae4a2c7a59f4a11a006bf1d0 (patch) | |
| tree | 7b95396adec2cea51196e6d4218ca9c85a85732f /pkgs/development/haskell-modules/make-package-set.nix | |
| parent | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (diff) | |
| parent | 734788b71da12826520e1e4322323b955bdf2eee (diff) | |
| download | nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.tar nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.tar.gz nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.tar.bz2 nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.tar.lz nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.tar.xz nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.tar.zst nixlib-dbd500937644c2deae4a2c7a59f4a11a006bf1d0.zip | |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
| -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 e53ae797c415..b6bd3fdd30b7 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -61,7 +61,7 @@ let mkDerivation = makeOverridable mkDerivationImpl; - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWith defaultScope drv args; |