ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 04:24:28 +03:00
Code Issues Projects Releases Wiki Activity

haskell shellFor: Fix hoogle

Browse Source
This commit is contained in:
John Ericson 2020-02-22 13:10:30 -05:00
parent cb46b97ae9
commit 1c07ee7925
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -312,10 +312,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
in self.mkDerivation genericBuilderArgs; in self.mkDerivation genericBuilderArgs;
envFuncArgs = builtins.removeAttrs args [ "packages" ]; mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ];
in (combinedPackageFor packages).env.overrideAttrs (old: envFuncArgs // { in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // {
nativeBuildInputs = old.nativeBuildInputs ++ envFuncArgs.nativeBuildInputs or []; nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or [];
buildInputs = old.buildInputs ++ envFuncArgs.buildInputs or []; buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or [];
}); });
ghc = ghc // { ghc = ghc // {