diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-18 10:50:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-18 12:02:25 +0000 |
| commit | 529b5394941305e39b3b3bb116d4928e3421ac4a (patch) | |
| tree | 2b686c7e4f248dae61910e596a513018748a4ece /pkgs/os-specific/bsd | |
| parent | 5478217883e97b74a2c96f664d6e263925e7bbcf (diff) | |
| download | nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.tar nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.tar.gz nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.tar.bz2 nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.tar.lz nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.tar.xz nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.tar.zst nixpkgs-529b5394941305e39b3b3bb116d4928e3421ac4a.zip | |
netbsd.mkDerivation: popd in moveUsrDir
Permanently changing the directory here was breaking the kernel build, which needs to do other things after moveUsrDir.
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/builder.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/builder.sh b/pkgs/os-specific/bsd/netbsd/builder.sh index 925001567f7..332e5c2098f 100644 --- a/pkgs/os-specific/bsd/netbsd/builder.sh +++ b/pkgs/os-specific/bsd/netbsd/builder.sh @@ -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 |