diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-11 14:00:49 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-11 14:01:34 +0300 |
commit | e4b48c71864400a0e2ba79258668ff9b4762cd82 (patch) | |
tree | a6c047244b2be664f56c09a0fa89779fcae6cc3c /pkgs/development/libraries/libsigsegv | |
parent | 1ccd871fde18054e7abed0d76f197cbc196fef9b (diff) |
libsigsegv: Remove aarch64 patch, enable tests
The aarch64 patch has been applied upstream. Let's hope that the new release fixes the tests as well.
Diffstat (limited to 'pkgs/development/libraries/libsigsegv')
-rw-r--r-- | pkgs/development/libraries/libsigsegv/aarch64.patch | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/libsigsegv/default.nix | 9 |
2 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch deleted file mode 100644 index 7bb48a230cee8..0000000000000 --- a/pkgs/development/libraries/libsigsegv/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure -index 6c4e868..0298e19 100755 ---- a/configure -+++ b/configure -@@ -14501,6 +14501,7 @@ else - - case "$host_cpu" in - a29k | \ -+ aarch64* | \ - alpha* | \ - arc | \ - arm* | strongarm* | xscale* | \ diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 1cbd5bb52f55b..0e644686af02c 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -8,14 +8,7 @@ stdenv.mkDerivation rec { sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; - # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch - # but applied directly to configure since we can't use autoreconf while bootstrapping. - patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64" - then [ ./aarch64.patch ] - else null; # TODO: change to lib.optional on next mass rebuild - - # https://github.com/NixOS/nixpkgs/issues/6028 - doCheck = false; + doCheck = true; meta = { homepage = http://www.gnu.org/software/libsigsegv/; |