From 42574f52b9b4ed2ed13b745518fce0a642c27714 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 5 Feb 2017 11:08:32 +0100
Subject: [PATCH] Remove references to $NIX_STRIP_DEBUG

This was removed in 3ea1c308466d2daad18ceac4ef8176bb1c3c85de.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 2 +-
 pkgs/development/compilers/gcc/4.9/default.nix | 2 +-
 pkgs/development/compilers/gcc/5/default.nix   | 2 +-
 pkgs/development/compilers/gcc/6/default.nix   | 2 +-
 pkgs/misc/my-env/loadenv.sh                    | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index a0def65d5313..e6f990113ccc 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -544,7 +544,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 4b53bc35599f..eb03148a4b8d 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -551,7 +551,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3d75c0e76daa..1721eba325bf 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -547,7 +547,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 3edfb177b118..c6fac16a76ca 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -545,7 +545,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 816c1b8a7111..1688d2f158fb 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -10,7 +10,6 @@ PATH="$PATH:$OLDPATH"
 export PS1="\n@name@:[\u@\h:\w]\$ "
 export NIX_MYENV_NAME="@name@"
 export buildInputs
-export NIX_STRIP_DEBUG=0
 export TZ="$OLDTZ"
 export http_proxy="$OLD_http_proxy"
 export ftp_proxy="$OLD_ftp_proxy"