From ae129f0ff59e06eb60458c9e0baca3b925bd3121 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jul 2014 23:01:11 +0200
Subject: fftw: Update to 3.3.4

---
 pkgs/development/libraries/fftw/default.nix | 54 ++++++++++++-----------------
 1 file changed, 23 insertions(+), 31 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 97043f11f50..83735376b98 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,39 +1,31 @@
-{ fetchurl, stdenv, builderDefs, precision ? "double" }:
-
-assert stdenv.lib.elem precision [ "single" "double" "long-double" "quad-precision" ];
-
-with { inherit (stdenv.lib) optional; };
-
-let
-  version = "3.3.3";
-  localDefs = builderDefs.passthru.function {
-    src =
-      fetchurl {
-        url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
-        sha256 = "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5";
-      };
-    buildInputs = [];
-    configureFlags = [
-        "--enable-shared" "--disable-static"
-        "--enable-threads" "--enable-openmp" # very small wrappers
-      ]
-      ++ optional (precision != "double") "--enable-${precision}"
-      # all x86_64 have sse2
-      ++ optional stdenv.isx86_64 "--enable-sse2";
-  };
+{ fetchurl, stdenv, lib, precision ? "double" }:
+
+with lib;
+
+assert elem precision [ "single" "double" "long-double" "quad-precision" ];
 
-in with localDefs;
+let version = "3.3.4"; in
 
 stdenv.mkDerivation rec {
   name = "fftw-${precision}-${version}";
-  builder = writeScript "${name}-builder"
-    (textClosure localDefs [doConfigure doMakeInstall doForceShare]);
+
+  src = fetchurl {
+    url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
+    sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
+  };
+
+  configureFlags =
+    [ "--enable-shared" "--disable-static"
+      "--enable-threads" "--enable-openmp" # very small wrappers
+    ]
+    ++ optional (precision != "double") "--enable-${precision}"
+    # all x86_64 have sse2
+    ++ optional stdenv.isx86_64 "--enable-sse2";
+
+  enableParallelBuilding = true;
+
   meta = {
     description = "Fastest Fourier Transform in the West library";
-  };
-  passthru = {
-    # Allow instantiating "-A fftw.src"
-    inherit src;
+    homepage = http://www.fftw.org/;
   };
 }
-
-- 
cgit 1.4.1