diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2020-03-03 11:22:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 11:22:52 +0900 |
| commit | bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f (patch) | |
| tree | 8a3a7fafc56668de7b5f7b3609e76230c7c50fdb /pkgs/development/haskell-modules | |
| parent | c16f2218da6928ca52bb500cbebe4c62a67f90f8 (diff) | |
| parent | 196682b1755abab6adef36666cc045f5dbb63281 (diff) | |
| download | nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.tar nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.tar.gz nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.tar.bz2 nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.tar.lz nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.tar.xz nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.tar.zst nixlib-bd2c1d72c5a77bfc78693c5b6d121a9e8bb59e6f.zip | |
Merge pull request #80845 from obsidiansystems/work-on-multi-shellFor
haskell shellFor: Fix hoogle
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9ba25e09db93..17fb1ab8ae85 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -315,10 +315,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // { in self.mkDerivation genericBuilderArgs; - envFuncArgs = builtins.removeAttrs args [ "packages" ]; - in (combinedPackageFor packages).env.overrideAttrs (old: envFuncArgs // { - nativeBuildInputs = old.nativeBuildInputs ++ envFuncArgs.nativeBuildInputs or []; - buildInputs = old.buildInputs ++ envFuncArgs.buildInputs or []; + mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ]; + in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // { + nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; + buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or []; }); ghc = ghc // { |