BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace cachix.cabal --replace "c++14" "c++17"
'';
});
cachix = addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost];
niv = enableSeparateBinOutput super.niv;
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 { };
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
cachix = haskellPackages.cachix.bin;
niv = haskellPackages.niv.bin;
capnproto = callPackage ../development/libraries/capnproto { };