JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #80845 from obsidiansystems/work-on-multi-shellFor

Browse Source 
haskell shellFor: Fix hoogle
This commit is contained in:
Dennis Gosnell 2020-03-03 11:22:52 +09:00 committed by GitHub
commit bd2c1d72c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -315,10 +315,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 // {