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

cachix: workaround https://github.com/NixOS/nix/issues/2990

This commit is contained in:
Domen Kožar 2019-10-03 10:52:06 +02:00
parent 45e3058f78
commit ab5863afad
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super {
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";
# profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8 # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
cachix = disableLibraryProfiling (enableSeparateBinOutput super.cachix); cachix = disableLibraryProfiling super.cachix;
niv = enableSeparateBinOutput super.niv; niv = enableSeparateBinOutput super.niv;

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

@ -10467,7 +10467,8 @@ in
c-blosc = callPackage ../development/libraries/c-blosc { }; c-blosc = callPackage ../development/libraries/c-blosc { };
cachix = haskellPackages.cachix.bin; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
niv = haskellPackages.niv.bin; niv = haskellPackages.niv.bin;