diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index fac0a419bfd1..af5bd2220d47 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -94,6 +94,8 @@ 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 = enableSeparateBinOutput super.cachix; + hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix index 895d6e4bec62..a127fb137f67 100644 --- a/pkgs/development/tools/cachix/default.nix +++ b/pkgs/development/tools/cachix/default.nix @@ -1,3 +1,3 @@ { haskellPackages, haskell }: -haskell.lib.justStaticExecutables haskellPackages.cachix +(haskell.lib.doDistribute haskellPackages.cachix).bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28665941d61a..d8c3459e9874 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9601,11 +9601,7 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = (callPackage ../development/tools/cachix { }).overrideAttrs (drv: { - meta = drv.meta // { - hydraPlatforms = stdenv.lib.platforms.unix; - }; - }); + cachix = callPackage ../development/tools/cachix { }; capnproto = callPackage ../development/libraries/capnproto { };