summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-02-19 15:24:32 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-02-19 15:24:32 +0100
commit882062004ba61e26579c20f65d6eee2c8336c544 (patch)
treea4a3b4bc78dbbdada21e0c22a57898a575cc54d9 /pkgs/stdenv
parent0c8939b5fbb276be0cbf00b6f6bfcbc56806164b (diff)
parent7e70afc6ffc820dd9edba74d62ff37f922149447 (diff)
downloadnixlib-882062004ba61e26579c20f65d6eee2c8336c544.tar
nixlib-882062004ba61e26579c20f65d6eee2c8336c544.tar.gz
nixlib-882062004ba61e26579c20f65d6eee2c8336c544.tar.bz2
nixlib-882062004ba61e26579c20f65d6eee2c8336c544.tar.lz
nixlib-882062004ba61e26579c20f65d6eee2c8336c544.tar.xz
nixlib-882062004ba61e26579c20f65d6eee2c8336c544.tar.zst
nixlib-882062004ba61e26579c20f65d6eee2c8336c544.zip
Merge branch 'staging' into gcc-7
I'm betting Hydra resources on gcc-7 getting to master before current staging.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e4a77af199b9..d7a4781448ae 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -866,7 +866,7 @@ unpackPhase() {
     # necessary when sources have been copied from other store
     # locations.
     if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
-        chmod -R u+w "$sourceRoot"
+        chmod -R u+w -- "$sourceRoot"
     fi
 
     runHook postUnpack