diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-09 00:12:48 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-09 00:12:48 +0200 |
| commit | 627923d5b7dd4d2a7633a9b7771f76f522961810 (patch) | |
| tree | 7e7e18ff6d7ed3e9f4067854a9b6a9e4c4e2577d /pkgs/stdenv | |
| parent | e09250d41ccaf65c570ba94c0335493365807770 (diff) | |
| download | nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.tar nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.tar.gz nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.tar.bz2 nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.tar.lz nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.tar.xz nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.tar.zst nixlib-627923d5b7dd4d2a7633a9b7771f76f522961810.zip | |
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.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 03000d0cdd89..ea61e7d68a28 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"; |