From 627923d5b7dd4d2a7633a9b7771f76f522961810 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Apr 2014 00:12:48 +0200 Subject: [PATCH] Replace $HYDRA_DISALLOW_UNFREE with $NIXPKGS_ALLOW_UNFREE We've never used this environment variable in Hydra (except for a few days). This is also more consistent with $NIXPKGS_ALLOW_BROKEN. --- pkgs/stdenv/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 03000d0cdd8..ea61e7d68a2 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -14,7 +14,7 @@ let lib = import ../../../lib; in lib.makeOverridable ( let - allowUnfree = config.allowUnfree or false && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; + allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";