diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-08-05 19:24:32 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-08-05 19:24:32 +0000 |
commit | a53504f4a428529e08beda8956f96e7337bb6d12 (patch) | |
tree | d0f096ce167355371d71b1048752b077675f4931 /pkgs/stdenv | |
parent | 71680eb127aea3bf6abb6fba1babcb3b212ebb3b (diff) | |
download | nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.tar nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.tar.gz nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.tar.bz2 nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.tar.lz nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.tar.xz nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.tar.zst nixpkgs-a53504f4a428529e08beda8956f96e7337bb6d12.zip |
stdenv: shadow doCheck and doInstallCheck
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 48ee68f4c00..9aed883d57c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -78,6 +78,11 @@ rec { , ... } @ attrs: let + # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when + # no package has `doCheck = true`. + doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; + fixedOutputDrv = attrs ? outputHash; noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated ++ depsHostHost ++ depsHostHostPropagated @@ -97,6 +102,9 @@ rec { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; }) else let + doCheck = doCheck'; + doInstallCheck = doInstallCheck'; + references = nativeBuildInputs ++ buildInputs ++ propagatedNativeBuildInputs ++ propagatedBuildInputs; @@ -111,7 +119,7 @@ rec { [ (map (drv: drv.__spliced.hostHost or drv) depsHostHost) (map (drv: drv.crossDrv or drv) (buildInputs - ++ lib.optionals doCheck' checkInputs + ++ lib.optionals doCheck checkInputs ++ lib.optionals doInstallCheck' installCheckInputs)) ] [ @@ -133,11 +141,6 @@ rec { ] ]; - # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when - # no package has `doCheck = true`. - doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; - doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; - outputs' = outputs ++ (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); @@ -165,7 +168,6 @@ rec { derivationArg = (removeAttrs attrs ["meta" "passthru" "pos" - "doCheck" "doInstallCheck" "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) @@ -212,15 +214,11 @@ rec { ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + inherit doCheck doInstallCheck; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (outputs' != [ "out" ]) { outputs = outputs'; - } // lib.optionalAttrs doCheck' { - doCheck = true; - } // lib.optionalAttrs doInstallCheck' { - doInstallCheck = true; - } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = |