diff options
author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
commit | 9adad8612b082bcbae30c81678a04b79a44079a4 (patch) | |
tree | 6814d056ee2960d122842dc9c830bb411c40d5ff /pkgs/development/libraries/fftw | |
parent | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff) | |
download | nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.gz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.bz2 nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.lz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.xz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.zst nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.zip |
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'pkgs/development/libraries/fftw')
-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 cf009599665..6b92848fd0f 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.5"; in +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 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf"; + 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}" |