diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-06-27 11:28:21 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-06-27 11:28:50 +0200 |
| commit | 58f7bf5b684a77f9a7debf0b0adaf050271cd5f5 (patch) | |
| tree | c1192df713b6b5af4200718dfeed8aabb3fb68e9 /pkgs/development/libraries/gsl | |
| parent | 9c5f76bc0ff4e7b0d0c48b809809117e9d538e99 (diff) | |
| download | nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.tar nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.tar.gz nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.tar.bz2 nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.tar.lz nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.tar.xz nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.tar.zst nixpkgs-58f7bf5b684a77f9a7debf0b0adaf050271cd5f5.zip | |
gsl: fix i686 tests by upstream patch
Diffstat (limited to 'pkgs/development/libraries/gsl')
| -rw-r--r-- | pkgs/development/libraries/gsl/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/gsl/disable-fma.patch | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index da4796fba89..011e4ecd48e 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { name = "gsl-1.16"; @@ -8,9 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; - # ToDo: there might be more impurities than FMA support check - patches = [ ./disable-fma.patch ]; # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - patchFlags = "-p0"; + patches = [ + # ToDo: there might be more impurities than FMA support check + ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html + + (fetchpatch { + name = "bug-39055.patch"; + url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d0377"; + sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; + }) + ]; doCheck = true; diff --git a/pkgs/development/libraries/gsl/disable-fma.patch b/pkgs/development/libraries/gsl/disable-fma.patch index d5c0d620863..bb1eda9cccc 100644 --- a/pkgs/development/libraries/gsl/disable-fma.patch +++ b/pkgs/development/libraries/gsl/disable-fma.patch @@ -1,5 +1,5 @@ ---- configure.ac 2011-09-22 16:13:22 +0000 -+++ configure.ac 2011-11-26 23:55:24 +0000 +--- a/configure.ac 2011-09-22 16:13:22 +0000 ++++ b/configure.ac 2011-11-26 23:55:24 +0000 @@ -381,6 +381,28 @@ AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE) AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE) |