From 3a59830c446b6e55dbe0d44022eee79d780f19d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 29 Sep 2019 09:52:11 +0200 Subject: [PATCH] cachix&niv: use separate bin output --- pkgs/development/haskell-modules/configuration-nix.nix | 8 +++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2f815d8a5f1..3ef96ca4138 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d333251dd4d..7d687145893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };