diff options
| author | Bart Brouns <bart@magnetophon.nl> | 2016-07-29 20:22:04 +0200 |
|---|---|---|
| committer | Bart Brouns <bart@magnetophon.nl> | 2016-07-29 20:25:00 +0200 |
| commit | 926038ab4ce25620a7bf722f98523ee5b6eec52b (patch) | |
| tree | 79559d7205265dab0ff96b70a425b3a517e484e3 /pkgs/development/libraries | |
| parent | 514011abe70fe4dee3d28c706df9fa4a4868b22a (diff) | |
| download | nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.tar nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.tar.gz nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.tar.bz2 nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.tar.lz nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.tar.xz nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.tar.zst nixlib-926038ab4ce25620a7bf722f98523ee5b6eec52b.zip | |
fftw: fixup build of 3.3.5-rc1
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 2357909537ed..6b92848fd0f7 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, precision ? "double" }: +{ fetchFromGitHub , stdenv, lib, ocaml, perl, indent, transfig, ghostscript, texinfo, libtool, gettext, automake, autoconf, precision ? "double" }: with lib; @@ -9,16 +9,26 @@ let version = "3.3.5-rc1"; in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; - src = fetchurl { - url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "086z9xq5jy58w5lqygq4rpragcy2r0dz3lzci3mh0vghs9c6zgk6"; + src = fetchFromGitHub { + owner = "FFTW"; + repo = "fftw3"; + rev = "fftw-${version}"; + sha256 = "1gc57xvdqbapq30ylj3fxwkv61la4kzyf7ji0q0xqjwpji2ynqi4"; }; + nativeBuildInputs = [ ocaml perl indent transfig ghostscript texinfo libtool gettext automake autoconf ]; + + # remove the ./configure lines, so we can use nix's configureFlags + patchPhase = "sed -e '27,29d' -i bootstrap.sh"; + + preConfigurePhases = "./bootstrap.sh"; + outputs = [ "dev" "out" "doc" ]; # it's dev-doc only outputBin = "dev"; # fftw-wisdom configureFlags = - [ "--enable-shared" "--disable-static" + [ "--enable-maintainer-mode" + "--enable-shared" "--disable-static" "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" |