netbsd.mkDerivation: popd in moveUsrDir
Permanently changing the directory here was breaking the kernel build, which needs to do other things after moveUsrDir.
This commit is contained in:
parent
5478217883
commit
529b539494
|
@ -105,9 +105,10 @@ moveUsrDir() {
|
|||
if [ -d $prefix ]; then
|
||||
# Remove lingering /usr references
|
||||
if [ -d $prefix/usr ]; then
|
||||
cd $prefix/usr
|
||||
pushd $prefix/usr
|
||||
find . -type d -exec mkdir -p $out/\{} \;
|
||||
find . \( -type f -o -type l \) -exec mv \{} $out/\{} \;
|
||||
popd
|
||||
fi
|
||||
|
||||
find $prefix -type d -empty -delete
|
||||
|
|
Loading…
Reference in a new issue