From 8f6ae032c0df7d135fe717e19f6d59545892f6b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Jan 2016 15:03:42 +0100 Subject: [PATCH] ccache: cherry-pick a (backported upstream) bug-fix --- pkgs/development/tools/misc/ccache/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ed87428f98df..29fe621d6764 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 = ''