mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 08:36:41 +01:00
gsl: fix i686 tests by upstream patch
This commit is contained in:
parent
9c5f76bc0f
commit
58f7bf5b68
2 changed files with 13 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ fetchurl, stdenv }:
|
{ fetchurl, fetchpatch, stdenv }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gsl-1.16";
|
name = "gsl-1.16";
|
||||||
|
@ -8,9 +8,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
|
sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
# ToDo: there might be more impurities than FMA support check
|
# 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
|
./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
|
||||||
patchFlags = "-p0";
|
|
||||||
|
(fetchpatch {
|
||||||
|
name = "bug-39055.patch";
|
||||||
|
url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d0377";
|
||||||
|
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- configure.ac 2011-09-22 16:13:22 +0000
|
--- a/configure.ac 2011-09-22 16:13:22 +0000
|
||||||
+++ configure.ac 2011-11-26 23:55:24 +0000
|
+++ b/configure.ac 2011-11-26 23:55:24 +0000
|
||||||
@@ -381,6 +381,28 @@
|
@@ -381,6 +381,28 @@
|
||||||
AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
|
AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
|
||||||
AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
|
AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
|
||||||
|
|
Loading…
Reference in a new issue