summary refs log tree commit diff
path: root/pkgs/development/tools/misc/ccache
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-04 15:03:42 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-04 15:11:51 +0100
commit8f6ae032c0df7d135fe717e19f6d59545892f6b8 (patch)
tree28f19a24e05bc03af7c12ee255c23b889ba54707 /pkgs/development/tools/misc/ccache
parentd1cb42f297e11a1ada84b9203da2a7ad5d7ad795 (diff)
downloadnixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.tar
nixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.tar.gz
nixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.tar.bz2
nixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.tar.lz
nixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.tar.xz
nixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.tar.zst
nixpkgs-8f6ae032c0df7d135fe717e19f6d59545892f6b8.zip
ccache: cherry-pick a (backported upstream) bug-fix
Diffstat (limited to 'pkgs/development/tools/misc/ccache')
-rw-r--r--pkgs/development/tools/misc/ccache/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index ed87428f98d..29fe621d676 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, gcc, zlib }:
+{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
 
 let
   name = "ccache-${version}";
@@ -13,6 +13,15 @@ stdenv.mkDerivation {
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
+  patches = [
+    (fetchpatch {
+      sha256 = "1gwnxx1w2nx1szi0v5vgwcx9i23pxygkqqnrawhal68qgz5c34wh";
+      name = "dont-update-manifest-in-readonly-modes.patch";
+      # The primary git.samba.org doesn't seem to like our curl much...
+      url = "https://github.com/jrosdahl/ccache/commit/a7ab503f07e31ebeaaec34fbaa30e264308a299d.patch";
+    })
+  ];
+
   buildInputs = [ zlib ];
 
   postPatch = ''