From f8ce957263d4ff2fc910f99511ceb16a20381101 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 13:26:20 -0400 Subject: [PATCH 01/10] expat: Don't run tests when cross-compiling --- pkgs/development/libraries/expat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 6533997de2f..77b826acc03 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputMan = "dev"; # tiny page for a dev tool - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; preCheck = '' patchShebangs ./run.sh From bba7c214ff4b4b42733fe197eac323d4d1b7d1aa Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 14:01:40 -0400 Subject: [PATCH 02/10] libunistring: Don't run tests when cross-compiling --- pkgs/development/libraries/libunistring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index c4acc0627af..42376b61f42 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # XXX: There are test failures on non-GNU systems, see # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html . - doCheck = stdenv ? glibc; + doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform); meta = { homepage = http://www.gnu.org/software/libunistring/; From 97c1211f95f13acdc2bd87717924fdceea20804c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 14:13:36 -0400 Subject: [PATCH 03/10] libidn: Don't run tests when cross-compiling --- pkgs/development/libraries/libidn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 3de9cf1e0db..df92693de5a 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - doCheck = ! stdenv.isDarwin; + doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin; hardeningDisable = [ "format" ]; From 6b1a2b3089d4307e10f87618325ce17dc1e6f934 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 15:36:30 -0400 Subject: [PATCH 04/10] boehm-gc: Don't run tests when cross-compiling --- pkgs/development/libraries/boehm-gc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index e4311c0a5e9..1ac96e2b4f0 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; From 99932a894f560d903e65229e157275ec9a5ee94c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 15:39:35 -0400 Subject: [PATCH 05/10] gdbm: Don't run tests when cross-compiling --- pkgs/development/libraries/gdbm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index c6313dec90c..3b78225a447 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; }; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. From 09ce1ebd8fed514147070aa17a95b0b501d8baf5 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 16:54:36 -0400 Subject: [PATCH 06/10] libxml2: Don't run tests when cross-compiling --- pkgs/development/libraries/libxml2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 28b6faa436a..bf38a954d60 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin; crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM From de347ad65f69557ca27056d707f0414b25bb7575 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 18 Oct 2017 00:48:49 -0400 Subject: [PATCH 07/10] lzo: Don't run tests when cross-compiling --- pkgs/development/libraries/lzo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 8739c9d25d5..e8f8a6ab9bb 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; meta = with stdenv.lib; { description = "Real-time data (de)compression library"; From 3ed6239d6bdde9eb1774299d6b921781113865ae Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 26 Oct 2017 21:53:57 -0400 Subject: [PATCH 08/10] gnutls: Don't run tests when cross-compiling --- pkgs/development/libraries/gnutls/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 0b633f0a2f1..d2947cd7c6b 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -12,7 +12,8 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" + && stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { name = "gnutls-${version}"; From 765fbe8f105edae51187c538488d5072b4ac18a7 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 17:05:38 -0400 Subject: [PATCH 09/10] libtiff: Don't run testsuite when cross-compiling --- pkgs/development/libraries/libtiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index f43db801f24..ee21f3df7ac 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; From 0c0834f0180bb0ffc577be3cbd4c24540624f9e5 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 17:04:58 -0400 Subject: [PATCH 10/10] libjpeg-turbo: Don't run testsuite when cross-compiling --- pkgs/development/libraries/libjpeg-turbo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 1023c8ae505..77f9d999de4 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; checkTarget = "test"; meta = with stdenv.lib; {