public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv lib64-moving: fail instead of overwriting

Browse Source 
Silent overwriting is dangerous and it bit us straightaway on gcc_multi.
https://github.com/NixOS/nixpkgs/commit/51f1b4ec48d5
This commit is contained in:
Vladimír Čunát 2014-11-14 11:38:33 +01:00
parent 581721887d
commit 8e44ae5bd4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/setup-hooks/move-lib64.sh
View File

@ -3,6 +3,7 @@
# $output/lib. The rationale is that lib64 directories are unnecessary # $output/lib. The rationale is that lib64 directories are unnecessary
# in Nix (since 32-bit and 64-bit builds of a package are in different # in Nix (since 32-bit and 64-bit builds of a package are in different
# store paths anyway). # store paths anyway).
# If the move would overwrite anything, it should fail on rmdir.
fixupOutputHooks+=(_moveLib64) fixupOutputHooks+=(_moveLib64)
@ -13,7 +14,7 @@ _moveLib64() {
mkdir -p $prefix/lib mkdir -p $prefix/lib
shopt -s dotglob shopt -s dotglob
for i in $prefix/lib64/*; do for i in $prefix/lib64/*; do
mv "$i" $prefix/lib mv --no-clobber "$i" $prefix/lib
done done
shopt -u dotglob shopt -u dotglob
rmdir $prefix/lib64 rmdir $prefix/lib64