diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-15 06:07:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 06:07:54 +0000 |
| commit | 4f07e7f326780b00020e1cfd57e216d10e5526e4 (patch) | |
| tree | e31d650939268c2a2a3bd9d8af292dbcdc82b305 /pkgs/stdenv | |
| parent | 886633ba433d947a05ff2275ccf019b1e820debe (diff) | |
| parent | 5b04d5b51b2695e7bcd05d5dcb8ce5eda0d0150c (diff) | |
| download | nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.tar nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.tar.gz nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.tar.bz2 nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.tar.lz nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.tar.xz nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.tar.zst nixpkgs-4f07e7f326780b00020e1cfd57e216d10e5526e4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 7b06692ac8c..ce39130d315 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -16,8 +16,11 @@ let allowUnfree = config.allowUnfree || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; - allowNonSource = config.allowNonSource or true - && builtins.getEnv "NIXPKGS_ALLOW_NONSOURCE" != "0"; + allowNonSource = let + envVar = builtins.getEnv "NIXPKGS_ALLOW_NONSOURCE"; + in if envVar != "" + then envVar != "0" + else config.allowNonSource or true; allowlist = config.allowlistedLicenses or config.whitelistedLicenses or []; blocklist = config.blocklistedLicenses or config.blacklistedLicenses or []; |