diff options
| author | Domen Kožar <domen@dev.si> | 2019-10-03 10:52:06 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2019-10-03 10:52:24 +0200 |
| commit | ab5863afada3c1b50fc43bf774b75ea71b287cde (patch) | |
| tree | c72f89378ba40806602ac5bca68ac247bb52263e /pkgs | |
| parent | 45e3058f78e4d861f88499d5e67e9b0ad5e6f509 (diff) | |
| download | nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.tar nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.tar.gz nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.tar.bz2 nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.tar.lz nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.tar.xz nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.tar.zst nixlib-ab5863afada3c1b50fc43bf774b75ea71b287cde.zip | |
cachix: workaround https://github.com/NixOS/nix/issues/2990
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 17f3b2a258c4..ec9f4285f87c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super { 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 - cachix = disableLibraryProfiling (enableSeparateBinOutput super.cachix); + cachix = disableLibraryProfiling super.cachix; niv = enableSeparateBinOutput super.niv; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c6f306f77e..15ab0bf257cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10467,7 +10467,8 @@ in 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; |