git.iko.soy/typeable/nixpkgs
on master help sign in
cachix: workaround https://github.com/NixOS/nix/issues/2990
commitab5863afada3c1b50fc43bf774b75ea71b287cde authorDomen Kožar <domen@dev.si> dateThu 3 Oct 2019, 10:52 (7 years ago) parent45e3058
2 files changed+3−2
pkgs/development/haskell-modules/configuration-nix.nix+1−1 pkgs/top-level/all-packages.nix+2−1
pkgs/development/haskell-modules/configuration-nix.nix+1−1
@@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super {
9595 sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
9696
9797 # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
98− cachix = disableLibraryProfiling (enableSeparateBinOutput super.cachix);
98+ cachix = disableLibraryProfiling super.cachix;
9999
100100 niv = enableSeparateBinOutput super.niv;
101101
pkgs/top-level/all-packages.nix+2−1
@@ -10467,7 +10467,8 @@ in
1046710467
1046810468 c-blosc = callPackage ../development/libraries/c-blosc { };
1046910469
10470− cachix = haskellPackages.cachix.bin;
10470+ # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
10471+ cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
1047110472
1047210473 niv = haskellPackages.niv.bin;
1047310474