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

cross stdenv adaptor: Disable checkPhase by default 

Before gcc-cross-wrapper did this unconditionally
This commit is contained in:
John Ericson 2017-06-03 13:32:15 -04:00 committed by John Ericson
parent 594d264205
commit e0492d58a6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/adapters.nix
View File

@ -77,6 +77,9 @@ rec {
mkDerivation = mkDerivation =
{ name ? "", buildInputs ? [], nativeBuildInputs ? [] { name ? "", buildInputs ? [], nativeBuildInputs ? []
, propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
, # Disabling the tests by default when cross compiling, as usually the
# tests rely on being able to run produced binaries.
doCheck ? false
, configureFlags ? [] , configureFlags ? []
, # Target is not included by default because most programs don't care. , # Target is not included by default because most programs don't care.
# Including it then would cause needless massive rebuilds. # Including it then would cause needless massive rebuilds.
@ -115,6 +118,8 @@ rec {
++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook
; ;
inherit doCheck;
# This parameter is sometimes a string and sometimes a list, yuck # This parameter is sometimes a string and sometimes a list, yuck
configureFlags = let inherit (stdenv.lib) optional elem; in configureFlags = let inherit (stdenv.lib) optional elem; in
(if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags) (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags)