diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-14 11:40:32 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-14 11:43:00 +0200 |
| commit | 4bceaca196cd6be14a584be45510ca85f873ffe7 (patch) | |
| tree | e7b26e82b6f95c17bf0ac3471e368454ea5688bf /pkgs | |
| parent | 3819044de11cc9f12b35f3f67abb4fd1699fcb1f (diff) | |
| parent | b25aeb8e7f9ce6d3c9a947f61cd90087fc69a645 (diff) | |
| download | nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.tar nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.tar.gz nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.tar.bz2 nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.tar.lz nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.tar.xz nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.tar.zst nixlib-4bceaca196cd6be14a584be45510ca85f873ffe7.zip | |
Re-merge #17112: fftw: 3.3.4 -> 3.3.5
By mistake in df2102b6a2 I merged an older version of the PR so we only had an -RC version; I'm sorry.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 6b92848fd0f7..cf009599665e 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,34 +1,24 @@ -{ fetchFromGitHub , stdenv, lib, ocaml, perl, indent, transfig, ghostscript, texinfo, libtool, gettext, automake, autoconf, precision ? "double" }: +{ fetchurl, stdenv, lib, precision ? "double" }: with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let version = "3.3.5-rc1"; in +let version = "3.3.5"; in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; - src = fetchFromGitHub { - owner = "FFTW"; - repo = "fftw3"; - rev = "fftw-${version}"; - sha256 = "1gc57xvdqbapq30ylj3fxwkv61la4kzyf7ji0q0xqjwpji2ynqi4"; + src = fetchurl { + url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; + sha256 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf"; }; - 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-maintainer-mode" - "--enable-shared" "--disable-static" + [ "--enable-shared" "--disable-static" "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" |