From d02ac63f4f4db57f0924fda26ee71e90947f2be4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 28 Sep 2022 23:18:33 +0100 Subject: [PATCH] stdenv/check-meta: fix support for NIXPKGS_ALLOW_NONSOURCE=1 --- pkgs/stdenv/generic/check-meta.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 7b06692ac8ce..ce39130d3151 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 [];