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

cachix&niv: use separate bin output

Browse Source
This commit is contained in:
Domen Kožar 2019-09-29 09:52:11 +02:00
parent 606b9f40aa
commit 3a59830c44
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -94,11 +94,9 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help. # Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: { cachix = addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost];
postPatch = (drv.postPatch or "") + ''
substituteInPlace cachix.cabal --replace "c++14" "c++17" niv = enableSeparateBinOutput super.niv;
'';
});
ghcid = enableSeparateBinOutput super.ghcid; ghcid = enableSeparateBinOutput super.ghcid;

4
pkgs/top-level/all-packages.nix
View File

@ -10420,7 +10420,9 @@ in
c-blosc = callPackage ../development/libraries/c-blosc { }; c-blosc = callPackage ../development/libraries/c-blosc { };
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; cachix = haskellPackages.cachix.bin;
niv = haskellPackages.niv.bin;
capnproto = callPackage ../development/libraries/capnproto { }; capnproto = callPackage ../development/libraries/capnproto { };