fix flattening

2023-12-03 15:46:00 +01:00
parent 44ce69444d
commit b074b8dff7
1 changed files with 2 additions and 2 deletions
--- a/utils/pkgs/sysbox.nix
+++ b/utils/pkgs/sysbox.nix
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {

    # Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to.
    # mv "$out/lib" "$out/orig_lib"
-    # mv "$out/usr/"* "$out/"
+    mv "$out/usr/"* "$out/"
    # mkdir -p "$out/lib/systemd/system/"
    # mv "$out/orig_lib/systemd/system/"* "$out/lib/systemd/system/"
    # rmdir "$out/orig_lib/systemd/system"
    # rmdir "$out/orig_lib/systemd"
    # rmdir "$out/orig_lib"
-    # rmdir "$out/usr"
+    rmdir "$out/usr"

    for f in "$out/lib/systemd/system/"*.service; do
        substituteInPlace "$f" \