diff options
Diffstat (limited to 'pkgs/development/tools/misc/ccache/default.nix')
| -rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 4128118decf6..b905f5e8ed5e 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -7,26 +7,25 @@ , cmake , perl , zstd +, bashInteractive , xcodebuild , makeWrapper }: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.2.1"; + version = "4.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-AmgJpW7AGCSggbHp1fLO5yhXS9LIm7O77nQdDERJYAA="; + hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM="; }; - patches = [ - # test/run use compgen to get environment variable names, but - # compgen isn't available in non-interactive bash. - ./env-instead-of-compgen.patch + outputs = [ "out" "man" ]; + patches = [ # 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 @@ -38,18 +37,22 @@ let ccache = stdenv.mkDerivation rec { ]; nativeBuildInputs = [ asciidoc cmake perl ]; - buildInputs = [ zstd ]; - outputs = [ "out" "man" ]; - doCheck = true; - checkInputs = lib.optional stdenv.isDarwin xcodebuild; + checkInputs = [ + # test/run requires the compgen function which is available in + # bashInteractive, but not bash. + bashInteractive + ] ++ lib.optional stdenv.isDarwin xcodebuild; + checkPhase = '' + runHook preCheck export HOME=$(mktemp -d) ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' -E '^(test.nocpp2|test.basedir|test.multi_arch)$' ''} + runHook postCheck ''; passthru = { |