alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

netbsd.mkDerivation: popd in moveUsrDir

Browse source 
Permanently changing the directory here was breaking the kernel build,
which needs to do other things after moveUsrDir.
This commit is contained in:
Alyssa Ross 2021-04-18 10:50:14 +00:00
parent 5478217883
commit 529b539494
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
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/os-specific/bsd/netbsd/builder.sh
View file

@ -105,9 +105,10 @@ moveUsrDir() {
if [ -d $prefix ]; then if [ -d $prefix ]; then
# Remove lingering /usr references # Remove lingering /usr references
if [ -d $prefix/usr ]; then if [ -d $prefix/usr ]; then
cd $prefix/usr pushd $prefix/usr
find . -type d -exec mkdir -p $out/\{} \; find . -type d -exec mkdir -p $out/\{} \;
find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; find . \( -type f -o -type l \) -exec mv \{} $out/\{} \;
popd
fi fi
find $prefix -type d -empty -delete find $prefix -type d -empty -delete