JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsl: fix i686 tests by upstream patch

Browse Source
This commit is contained in:
Vladimír Čunát 2015-06-27 11:28:21 +02:00
parent 9c5f76bc0f
commit 58f7bf5b68
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/gsl/default.nix
View File

@ -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;

4
pkgs/development/libraries/gsl/disable-fma.patch
View File

@ -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)