From 15893aab4795d44976151e30459da1e3f7f77de2 Mon Sep 17 00:00:00 2001 From: Timofei Kushnir Date: Wed, 28 Feb 2018 16:51:05 +0300 Subject: [PATCH] Follow-ups to contributors' comments - `gcc` was removed from `nativeBuildInputs` - ccache version updated to 3.4.1 - added `man` subpackage --- pkgs/development/tools/misc/ccache/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 9d44e0b707b..34d1d8a829b 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, perl, gcc, zlib, makeWrapper }: +{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.4"; + version = "3.4.1"; src = fetchurl { - sha256 = "0sfisvjs2iham29flxgmnfg7kzqz66bhk6q0qcwbdv1n569say5j"; + sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; url = "mirror://samba/ccache/${name}.tar.xz"; }; - nativeBuildInputs = [ perl gcc ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib ]; + outputs = [ "out" "man" ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) patches = [ ./fix-debug-prefix-map-suite.patch