diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-06-03 13:32:15 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:52:28 -0400 |
| commit | e0492d58a68a825924493d381bcc52a20177e5ef (patch) | |
| tree | f2d662edcaa94138b2312f4aff8ea740834b9e83 /pkgs/stdenv | |
| parent | 594d26420594acf458e5a8ab75229a2147d9194f (diff) | |
| download | nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.tar nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.tar.gz nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.tar.bz2 nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.tar.lz nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.tar.xz nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.tar.zst nixpkgs-e0492d58a68a825924493d381bcc52a20177e5ef.zip | |
cross stdenv adaptor: Disable checkPhase by default
Before gcc-cross-wrapper did this unconditionally
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7fd283ca823..7515a72fcfd 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -77,6 +77,9 @@ rec { mkDerivation = { name ? "", buildInputs ? [], nativeBuildInputs ? [] , 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 ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless massive rebuilds. @@ -115,6 +118,8 @@ rec { ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook ; + inherit doCheck; + # This parameter is sometimes a string and sometimes a list, yuck configureFlags = let inherit (stdenv.lib) optional elem; in (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags) |