diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
commit | 916793cf130a8269bbda881e9081370d74595538 (patch) | |
tree | 11c9e5d14f3178c6daf5a9c0a85f8a9e469ac356 /pkgs/development/tools/misc/ccache/default.nix | |
parent | 026c31dd9d6570fc6d7475c0102745cbfb0d6972 (diff) | |
parent | 86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5 (diff) | |
download | nixlib-916793cf130a8269bbda881e9081370d74595538.tar nixlib-916793cf130a8269bbda881e9081370d74595538.tar.gz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.bz2 nixlib-916793cf130a8269bbda881e9081370d74595538.tar.lz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.xz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.zst nixlib-916793cf130a8269bbda881e9081370d74595538.zip |
Merge branch 'master' into systemd-219
Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/tools/misc/ccache/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 0762d175e89d..41a6095a9a46 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, runCommand, gcc, zlib }: let - # TODO: find out if there's harm in just using 'rec' instead. name = "ccache-${version}"; - version = "3.2.2"; - sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"; + version = "3.2.3"; + sha256 = "03k0fvblwqb80zwdgas8a5fjrwvghgsn587wp3lfr0jr8gy1817c"; ccache = stdenv.mkDerivation { @@ -14,16 +13,19 @@ stdenv.mkDerivation { url = "mirror://samba/ccache/${name}.tar.xz"; }; - patches = [ ./test-drop-perl-requirement.patch ]; - buildInputs = [ zlib ]; + postPatch = '' + substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' + ''; + doCheck = true; passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; } + links = extraConfig: (runCommand "ccache-links" + { passthru.gcc = gcc; passthru.isGNU = true; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then @@ -42,6 +44,11 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/g++ fi + for executable in $(ls ${gcc.cc}/bin); do + if [ ! -x "$out/bin/$executable" ]; then + ln -s ${gcc.cc}/bin/$executable $out/bin/$executable + fi + done ''); }; |