From 559c5792ef1d0ef413e0abd5ddd07409989ceb1c Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 26 Apr 2021 16:20:13 +0200
Subject: Remove the NIXPKGS_CA_BY_DEFAULT env variable

Not really needed, and not desired either
---
 pkgs/stdenv/generic/make-derivation.nix | 3 +--
 1 file changed, 1 insertion(+), 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:
 
-- 
cgit 1.4.1