diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-02-05 13:11:33 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-02-05 13:11:33 +0100 |
commit | c135ecd7ef3b93a041de16a3694ee919fd0a7038 (patch) | |
tree | e61390a718882ee745a26af7d79c87e798d63fb8 /pkgs/stdenv | |
parent | f03c18869dfc6de2fc6dff0ba1520bc9d6c1f0db (diff) | |
parent | 39172792c6ef2717bf7a2b6788aa87fe0598229b (diff) | |
download | nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.tar nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.tar.gz nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.tar.bz2 nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.tar.lz nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.tar.xz nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.tar.zst nixpkgs-c135ecd7ef3b93a041de16a3694ee919fd0a7038.zip |
Merge remote-tracking branch 'origin/master' into gcc-7
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index dbbe45e45f3..e4a77af199b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -769,7 +769,7 @@ _defaultUnpack() { # We can't preserve hardlinks because they may have been # introduced by store optimization, which might break things # in the build. - cp -pr --reflink=auto "$fn" "$(stripHash "$fn")" + cp -pr --reflink=auto -- "$fn" "$(stripHash "$fn")" else |