diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-11-03 20:38:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 20:38:35 -0500 |
| commit | cf8a2d0225d531b3db333aa3c6c89866f90ff4b2 (patch) | |
| tree | e4a826462481955688da408b87d875b002cf61fa /pkgs/top-level/impure.nix | |
| parent | f3977504165d24f946ed1ad8fdc6b2bf8229e5c0 (diff) | |
| download | nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.tar nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.tar.gz nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.tar.bz2 nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.tar.lz nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.tar.xz nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.tar.zst nixlib-cf8a2d0225d531b3db333aa3c6c89866f90ff4b2.zip | |
Revert "stdenv/check-meta: getEnv if the attribute is unset (#72376)" (#72752)
This reverts commit 71184f8e157672789602d3f28bdd3c8079800687.
Diffstat (limited to 'pkgs/top-level/impure.nix')
| -rw-r--r-- | pkgs/top-level/impure.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 9ed31077172a..3ba6c08a140b 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -10,14 +10,6 @@ let # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception. try = x: def: let res = tryEval x; in if res.success then res.value else def; - defaultConfig = { - # These attributes are used in pkgs/stdenv/generic/check-meta.nix - allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; - allowInsecure = builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; - allowUnfree = builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; - allowUnsupportedSystem = builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; - }; - in { # We combine legacy `system` and `platform` into `localSystem`, if @@ -90,10 +82,7 @@ in assert args ? localSystem -> !(args ? system || args ? platform); import ./. (builtins.removeAttrs args [ "system" "platform" ] // { - inherit overlays crossSystem crossOverlays; - - config = defaultConfig // config; - + inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. localSystem = if builtins.isString localSystem then localSystem |