From b7aebdbf7053c494efac2f5f47ec59e520a78993 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 25 Oct 2016 17:22:00 +0300 Subject: valgrind: 3.11.0 -> 3.12.0 Also use more multiple outputs and perl shouldn't be a nativeBuildInput. --- pkgs/development/tools/analysis/valgrind/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'pkgs/development/tools/analysis/valgrind') diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 0e0e44183f6b..2ecb5eaa1329 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,30 +1,20 @@ { stdenv, fetchurl, fetchpatch, perl, gdb }: stdenv.mkDerivation rec { - name = "valgrind-3.11.0"; + name = "valgrind-3.12.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc"; + sha256 = "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7"; }; - patches = - [ (fetchpatch { - name = "glibc-2.21.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" - + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; - sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; - }) - ]; - - outputs = [ "out" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; hardeningDisable = [ "stackprotector" ]; # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. - nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb; + buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; enableParallelBuilding = true; -- cgit 1.4.1