From 5ad0728dfc0f1b147e5c0577ec7c2c2a76f0a538 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jan 2014 14:13:31 +0100
Subject: [PATCH] stdenv: In the fixupPhase, make the output writable first

Cherry-picked from 1d11c1dc48a3849f447350681ebba9d8cb97b979 in the
multiple-outputs branch.
---
 pkgs/stdenv/generic/setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 3dee8dc020b..47e90fb0560 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -288,9 +288,6 @@ stripDirs() {
 
     if [ -n "${dirs}" ]; then
         header "stripping (with flags $stripFlags) in $dirs"
-        for dir in $dirs; do
-            test -L "$dir" || chmod -R +rw "$dir"
-        done
         find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
         stopNest
     fi
@@ -735,6 +732,9 @@ installPhase() {
 fixupPhase() {
     runHook preFixup
 
+    # Make sure everything is writable so "strip" et al. work.
+    chmod -R u+w "$prefix"
+
     # Put man/doc/info under $out/share.
     forceShare=${forceShare:=man doc info}
     if [ -n "$forceShare" ]; then