diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-18 12:11:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 12:11:40 +0200 |
| commit | 3fbace382d3e7c1d1f2de54d7cdfa417e06a24fb (patch) | |
| tree | ac63d0751772e66cbe2b27a24b76f0c2d5306c46 /pkgs/development/tools/misc | |
| parent | c4186151b5405fd2173391f6f16450c2fe9abb49 (diff) | |
| parent | bec5a8c53353164843f73913b6e4a90ecb16667b (diff) | |
Merge pull request #127282 from r-burns/ccache
ccache: fix tests on darwin
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 94fca742b6d35..909a160c7eeab 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 , asciidoc @@ -34,6 +35,11 @@ let ccache = stdenv.mkDerivation rec { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }) + # Fix clang C++ modules test (remove in next release) + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch"; + sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla"; + }) ]; nativeBuildInputs = [ asciidoc cmake perl ]; |