From b4bd19762a262327db634bfab543760ce3f64e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Nov 2015 07:30:02 +0100
Subject: [PATCH] Revert "Don't fail if env-vars cannot be written to"

---
 pkgs/build-support/builder-defs/builder-defs.nix | 2 +-
 pkgs/stdenv/generic/setup.sh                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index e21b032aacbe..551ed9ea57e8 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -336,7 +336,7 @@ let inherit (builtins) head tail trace; in
 
         doDump = n: noDepEntry "echo Dump number ${n}; set";
 
-	saveEnv = noDepEntry ''export > "$TMP/env-vars" || true'';
+	saveEnv = noDepEntry ''export > $TMP/env-vars'';
 
 	doDumpBuildInputs = noDepEntry (''
 	  echo "${toString realBuildInputs}"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a01af7db70a3..57875fa6ada2 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -450,7 +450,7 @@ substituteAllInPlace() {
 # the environment used for building.
 dumpVars() {
     if [ "$noDumpEnvVars" != 1 ]; then
-        export > "$NIX_BUILD_TOP/env-vars" || true
+        export > "$NIX_BUILD_TOP/env-vars"
     fi
 }