diff options
author | regnat <rg@regnat.ovh> | 2021-04-26 16:20:13 +0200 |
---|---|---|
committer | regnat <rg@regnat.ovh> | 2021-04-26 16:20:13 +0200 |
commit | 559c5792ef1d0ef413e0abd5ddd07409989ceb1c (patch) | |
tree | 45a9986dd31229b86487118d19779e5f3e3e7ba6 | |
parent | cc5b30c6ac03273cfd76975ba83744a210f1704d (diff) | |
download | nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.tar nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.tar.gz nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.tar.bz2 nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.tar.lz nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.tar.xz nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.tar.zst nixlib-559c5792ef1d0ef413e0abd5ddd07409989ceb1c.zip |
Remove the NIXPKGS_CA_BY_DEFAULT env variable
Not really needed, and not desired either
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2bceb9e4333e..de1b1abd6155 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -91,8 +91,7 @@ in rec { , __contentAddressed ? (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too - && (config.contentAddressedByDefault or false - || builtins.getEnv "NIXPKGS_CA_BY_DEFAULT" == "1") + && (config.contentAddressedByDefault or false) , ... } @ attrs: |