treewide: Simplify some doCheck
calls
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:
parent
4e907dbca1
commit
133b4658df
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ lzip ];
|
nativeBuildInputs = [ lzip ];
|
||||||
|
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "An implementation of the standard Unix editor";
|
description = "An implementation of the standard Unix editor";
|
||||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||||||
[ "--enable-cplusplus" ]
|
[ "--enable-cplusplus" ]
|
||||||
++ lib.optional enableLargeConfig "--enable-large-config";
|
++ lib.optional enableLargeConfig "--enable-large-config";
|
||||||
|
|
||||||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
# Don't run the native `strip' when cross-compiling.
|
# Don't run the native `strip' when cross-compiling.
|
||||||
dontStrip = hostPlatform != buildPlatform;
|
dontStrip = hostPlatform != buildPlatform;
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputMan = "dev"; # tiny page for a dev tool
|
outputMan = "dev"; # tiny page for a dev tool
|
||||||
|
|
||||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
patchShebangs ./run.sh
|
patchShebangs ./run.sh
|
||||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
|
sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
# Linking static stubs on cygwin requires correct ordering.
|
# Linking static stubs on cygwin requires correct ordering.
|
||||||
# Consider upstreaming this.
|
# Consider upstreaming this.
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
{ stdenv, fetchurl, m4, cxx ? true
|
{ stdenv, fetchurl, m4, cxx ? true
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, buildPlatform, hostPlatform
|
|
||||||
, withStatic ? false }:
|
, withStatic ? false }:
|
||||||
|
|
||||||
let inherit (stdenv.lib) optional optionalString; in
|
let inherit (stdenv.lib) optional optionalString; in
|
||||||
@ -43,7 +42,7 @@ let self = stdenv.mkDerivation rec {
|
|||||||
configureFlagsArray+=("--build=$(./configfsf.guess)")
|
configureFlagsArray+=("--build=$(./configfsf.guess)")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = buildPlatform == hostPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
dontDisableStatic = withStatic;
|
dontDisableStatic = withStatic;
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
doCheck = true; # not cross;
|
||||||
checkTarget = "test";
|
checkTarget = "test";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
CFLAGS = "-I${gmp.dev}/include";
|
CFLAGS = "-I${gmp.dev}/include";
|
||||||
|
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Library for multiprecision complex arithmetic with exact rounding";
|
description = "Library for multiprecision complex arithmetic with exact rounding";
|
||||||
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# it's hard to cross-run tests and some check programs didn't compile anyway
|
# it's hard to cross-run tests and some check programs didn't compile anyway
|
||||||
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
|
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
passthru = { inherit zlib; };
|
passthru = { inherit zlib; };
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
|
patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
|
||||||
|
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/libsigsegv/;
|
homepage = http://www.gnu.org/software/libsigsegv/;
|
||||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Library and utilities for working with the TIFF image file format";
|
description = "Library and utilities for working with the TIFF image file format";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Real-time data (de)compression library";
|
description = "Real-time data (de)compression library";
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||||||
stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++
|
stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++
|
||||||
stdenv.lib.optional hostPlatform.is64bit "--with-pic";
|
stdenv.lib.optional hostPlatform.is64bit "--with-pic";
|
||||||
|
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ lzip ];
|
nativeBuildInputs = [ lzip ];
|
||||||
|
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];
|
configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||||||
"ac_cv_func_strnlen_working=yes"
|
"ac_cv_func_strnlen_working=yes"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = hostPlatform == buildPlatform;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "GNU Patch, a program to apply differences to files";
|
description = "GNU Patch, a program to apply differences to files";
|
||||||
|
Loading…
Reference in New Issue
Block a user