1 files changed, 21 insertions, 26 deletions

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 4592c1bb53f..5ffc287d114 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,24 +1,35 @@
 { stdenv, fetchurl, perl, gdb }:
 
-stdenv.mkDerivation (rec {
-  name = "valgrind-3.8.1";
+stdenv.mkDerivation rec {
+  name = "valgrind-3.9.0";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7";
+    sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6";
   };
 
-  patches = [ ./glibc-2.17.patch ];
+  patches = [ ./glibc-2.19.patch ];
 
   # 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;
 
+  enableParallelBuilding = true;
+
+  postPatch =
+    # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
+    ''
+      echo "getting rid of the \`-arch' GCC option..."
+      find -name Makefile\* -exec \
+        sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
+
+      sed -i coregrind/link_tool_exe_darwin.in \
+          -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
+    '';
+
   configureFlags =
-    if (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin")
-    then [ "--enable-only64bit" ]
-    else [];
+    stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit";
 
   postInstall = ''
     for i in $out/lib/valgrind/*.supp; do
@@ -41,25 +52,9 @@ stdenv.mkDerivation (rec {
       Valgrind to build new tools.
     '';
 
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ eelco ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-
-//
-
-(if stdenv.isDarwin
- then {
-   patchPhase =
-     # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
-     '' echo "getting rid of the \`-arch' GCC option..."
-        find -name Makefile\* -exec \
-          sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
-
-        sed -i coregrind/link_tool_exe_darwin.in \
-            -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
-     '';
- }
- else {}))