diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 8f5e8616a84..4508f0f529b 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper }: +{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: assert packages != []; @@ -12,6 +12,7 @@ in buildEnv { name = "haskell-env-${ghc.name}"; paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; + inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3d63b00dcc0..24bc93df865 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -102,8 +102,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # argument to this function. ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix { - ghc = ghc; # refers to ghcPlain + ghc = ghc; # refers to ghcPlain packages = pkgs self; + ignoreCollisions = false; }; ghcWithPackagesOld = pkgs : callPackage ../development/compilers/ghc/with-packages-old.nix {