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

treewide: Simplify some doCheck calls

Browse Source 
In anticipation of what I outline in #33599, I only simplify exactly those
`doCheck`s which are equal to `hostPlatform != buildPlatform`. I also stick a
comment next to them so I can grep for them later.
This commit is contained in:
John Ericson 2018-01-08 02:19:47 -05:00
parent 4e907dbca1
commit 133b4658df
14 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/ed/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ lzip ];
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
meta = {
description = "An implementation of the standard Unix editor";

2
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
[ "--enable-cplusplus" ]
++ lib.optional enableLargeConfig "--enable-large-config";
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
doCheck = true; # not cross;
# Don't run the native `strip' when cross-compiling.
dontStrip = hostPlatform != buildPlatform;

2
pkgs/development/libraries/expat/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
outputMan = "dev"; # tiny page for a dev tool
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = true; # not cross;
preCheck = ''
patchShebangs ./run.sh

2
pkgs/development/libraries/gdbm/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
};
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
doCheck = true; # not cross;
# Linking static stubs on cygwin requires correct ordering.
# Consider upstreaming this.

3
pkgs/development/libraries/gmp/6.x.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, m4, cxx ? true
, buildPackages
, buildPlatform, hostPlatform
, withStatic ? false }:
let inherit (stdenv.lib) optional optionalString; in
@ -43,7 +42,7 @@ let self = stdenv.mkDerivation rec {
configureFlagsArray+=("--build=$(./configfsf.guess)")
'';
doCheck = buildPlatform == hostPlatform;
doCheck = true; # not cross;
dontDisableStatic = withStatic;

2
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
doCheck = true; # not cross;
checkTarget = "test";
meta = with stdenv.lib; {

2
pkgs/development/libraries/libmpc/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
CFLAGS = "-I${gmp.dev}/include";
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
meta = {
description = "Library for multiprecision complex arithmetic with exact rounding";

2
pkgs/development/libraries/libpng/default.nix
View File

@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
# it's hard to cross-run tests and some check programs didn't compile anyway
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
passthru = { inherit zlib; };

2
pkgs/development/libraries/libsigsegv/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
meta = {
homepage = http://www.gnu.org/software/libsigsegv/;

2
pkgs/development/libraries/libtiff/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
doCheck = true; # not cross;
meta = with stdenv.lib; {
description = "Library and utilities for working with the TIFF image file format";

2
pkgs/development/libraries/lzo/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = true; # not cross;
meta = with stdenv.lib; {
description = "Real-time data (de)compression library";

2
pkgs/development/libraries/mpfr/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++
stdenv.lib.optional hostPlatform.is64bit "--with-pic";
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
enableParallelBuilding = true;

2
pkgs/tools/system/ddrescue/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ lzip ];
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];
meta = with stdenv.lib; {

2
pkgs/tools/text/gnupatch/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
"ac_cv_func_strnlen_working=yes"
];
doCheck = hostPlatform == buildPlatform;
doCheck = true; # not cross;
meta = {
description = "GNU Patch, a program to apply differences to files";