diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-02-22 13:10:30 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-02-22 13:10:30 -0500 |
| commit | 1c07ee79255bb3fe8a7eb382cd5a8348e0b85893 (patch) | |
| tree | e51264cae1ab1a010164d61b9eb461b63541a5e4 /pkgs/development/haskell-modules | |
| parent | cb46b97ae93b0c26af5ab65ee7f2f9b291027f43 (diff) | |
| download | nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.tar nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.tar.gz nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.tar.bz2 nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.tar.lz nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.tar.xz nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.tar.zst nixlib-1c07ee79255bb3fe8a7eb382cd5a8348e0b85893.zip | |
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 d23df0df3171..b99ac9cbab9a 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -312,10 +312,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 // { |