@@ -7,26 +7,25 @@
77, cmake
88, perl
99, zstd
10+, bashInteractive
1011, xcodebuild
1112, makeWrapper
1213}:
1314
1415let ccache = stdenv.mkDerivation rec {
1516 pname = "ccache";
16− version = "4.2.1";
17+ version = "4.3";
1718
1819 src = fetchFromGitHub {
1920 owner = pname;
2021 repo = pname;
2122 rev = "v${version}";
22− hash = "sha256-AmgJpW7AGCSggbHp1fLO5yhXS9LIm7O77nQdDERJYAA=";
23+ hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM=";
2324 };
2425
25− patches = [
26− # test/run use compgen to get environment variable names, but
27− # compgen isn't available in non-interactive bash.
28− ./env-instead-of-compgen.patch
26+ outputs = [ "out" "man" ];
2927
28+ patches = [
3029 # When building for Darwin, test/run uses dwarfdump, whereas on
3130 # Linux it uses objdump. We don't have dwarfdump packaged for
3231 # Darwin, so this patch updates the test to also use objdump on
@@ -38,18 +37,22 @@ let ccache = stdenv.mkDerivation rec {
3837 ];
3938
4039 nativeBuildInputs = [ asciidoc cmake perl ];
41−
4240 buildInputs = [ zstd ];
4341
44− outputs = [ "out" "man" ];
45−
4642 doCheck = true;
47− checkInputs = lib.optional stdenv.isDarwin xcodebuild;
43+ checkInputs = [
44+ # test/run requires the compgen function which is available in
45+ # bashInteractive, but not bash.
46+ bashInteractive
47+ ] ++ lib.optional stdenv.isDarwin xcodebuild;
48+
4849 checkPhase = ''
50+ runHook preCheck
4951 export HOME=$(mktemp -d)
5052 ctest --output-on-failure ${lib.optionalString stdenv.isDarwin ''
5153 -E '^(test.nocpp2|test.basedir|test.multi_arch)$'
5254 ''}
55+ runHook postCheck
5356 '';
5457
5558 passthru = {