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

cachix: use separate bin output to prove it's useful

Browse Source 
Spares compilation time by not compiling the package twice.
This commit is contained in:
Domen Kožar 2019-03-29 15:10:54 +07:00
parent bd06834d5e
commit b06201bf6f
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
3 changed files with 4 additions and 6 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

@ -94,6 +94,8 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help. # Won't find it's header files without help.
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";
cachix = enableSeparateBinOutput super.cachix;
hzk = overrideCabal super.hzk (drv: { hzk = overrideCabal super.hzk (drv: {
preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";

2
pkgs/development/tools/cachix/default.nix
View File

@ -1,3 +1,3 @@
{ haskellPackages, haskell }: { haskellPackages, haskell }:
haskell.lib.justStaticExecutables haskellPackages.cachix (haskell.lib.doDistribute haskellPackages.cachix).bin

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

@ -9601,11 +9601,7 @@ in
c-blosc = callPackage ../development/libraries/c-blosc { }; c-blosc = callPackage ../development/libraries/c-blosc { };
cachix = (callPackage ../development/tools/cachix { }).overrideAttrs (drv: { cachix = callPackage ../development/tools/cachix { };
meta = drv.meta // {
hydraPlatforms = stdenv.lib.platforms.unix;
};
});
capnproto = callPackage ../development/libraries/capnproto { }; capnproto = callPackage ../development/libraries/capnproto { };