diff options
author | Bart Brouns <bart@magnetophon.nl> | 2016-07-19 19:00:22 +0200 |
---|---|---|
committer | Bart Brouns <bart@magnetophon.nl> | 2016-07-19 19:41:05 +0200 |
commit | 26d1390049c7fe11aece7fa4763cdbe7322a63b7 (patch) | |
tree | 25d13fd9091eb00486a452ee68cca43129ebced9 /pkgs/development/libraries | |
parent | d130c27c62d39348d1eda5c580072c7d9e826253 (diff) | |
download | nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.tar nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.tar.gz nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.tar.bz2 nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.tar.lz nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.tar.xz nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.tar.zst nixlib-26d1390049c7fe11aece7fa4763cdbe7322a63b7.zip |
fftw: 3.3.4 -> 05-06-2016
There has not been a release since 2014, but at least one important bug has been fixed: https://github.com/FFTW/fftw3/issues/16 The submitter of the bug, @x-42, has advised me to upgrade our distro, as the fftw devs are very conservative so this is not bleeding edge code.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index a7a02521c69c..a300d0b228ea 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,24 +1,34 @@ -{ fetchurl, stdenv, lib, precision ? "double" }: +{ fetchFromGitHub , stdenv, lib, ocaml, perl, indent, transfig, ghostscript, texinfo, libtool, gettext, automake, autoconf, precision ? "double" }: with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let version = "3.3.4"; in +let version = "05-06-2016"; in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; - src = fetchurl { - url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"; + src = fetchFromGitHub { + owner = "FFTW"; + repo = "fftw3"; + rev = "2ed010c62b1bc8ca6b23bfda2e09b8c28e1e8bcc"; + sha256 = "1rd1rfdnr2mgli1s7x7z03s26bqf5mrrysvlh028f1dljn7bwd2q"; }; + 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}" |