From 104f98c12af2f3782d64f9099c694f1fad339aa2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Nov 2015 17:18:57 +0100 Subject: [PATCH] fftw: add fftwLongDouble, disable SSE2 in that case --- pkgs/development/libraries/fftw/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 2bcc1cd69a7..dfa4541e34b 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { ] ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 - ++ optional stdenv.isx86_64 "--enable-sse2" + # however, not all float sizes fit + ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" ++ optional stdenv.cc.isGNU "--enable-openmp"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd7e4691f40..2366ac4a35e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6318,6 +6318,7 @@ let fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {};