nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "rmdir: avoid failing when directory did not exist"

Browse Source 
This reverts commit 45db499d2d.
This commit is contained in:
Eelco Dolstra 2020-02-02 15:29:40 +01:00
parent 0c960262d1
commit 5495cb91eb
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/activation/activation-script.nix
View File

@ -205,7 +205,7 @@ in
''
else ''
rm -f /usr/bin/env
rmdir -p /usr/bin || true
rmdir --ignore-fail-on-non-empty /usr/bin /usr
'';
system.activationScripts.ld-linux =
@ -218,7 +218,7 @@ in
mv -f ${target}.tmp ${target} # atomically replace
'' else ''
rm -f ${target}
rmdir $(dirname ${target}) || true
rmdir --ignore-fail-on-non-empty $(dirname ${target})
'')
{
"i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2";