diff options
| author | Kira Bruneau <kira.bruneau@pm.me> | 2021-09-11 09:06:32 -0400 |
|---|---|---|
| committer | Kira Bruneau <kira.bruneau@pm.me> | 2021-09-11 10:55:11 -0400 |
| commit | 2902a7921b67dbb908375dfafe4cff35130a2a9c (patch) | |
| tree | a0266a5c20c428f809522b2dfe49c79399312e6f /pkgs/development/tools/misc | |
| parent | 96e5548dfe196327f3b7a365815fea5a411c7ad2 (diff) | |
| download | nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.tar nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.tar.gz nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.tar.bz2 nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.tar.lz nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.tar.xz nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.tar.zst nixpkgs-2902a7921b67dbb908375dfafe4cff35130a2a9c.zip | |
ccache: 4.4 → 4.4.1
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 3b1b54e6547..018e65754d9 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , substituteAll , binutils , asciidoctor @@ -14,18 +15,25 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.4"; + version = "4.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZewR1srksfKCxehhAg3i8m+0OvmOSF+24njbtcc1GQY="; + hash = "sha256-zsJoaaxYVV78vsxq2nbOh9ZAU1giKp8Kh6qJFL120CQ="; }; outputs = [ "out" "man" ]; patches = [ + # Use the shell builtin pwd for the basedir test + # See https://github.com/ccache/ccache/pull/933 + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/58fd1fbe75a1b5dc3f9151947ace15164fdef91c.patch"; + sha256 = "BoBn4YSDy8pQxJ+fQHSsrUZDBVeLFWXIQ6CunDwMO7o="; + }) + # When building for Darwin, test/run uses dwarfdump, whereas on # Linux it uses objdump. We don't have dwarfdump packaged for # Darwin, so this patch updates the test to also use objdump on |