fix flattening
This commit is contained in:
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to.
|
# Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to.
|
||||||
# mv "$out/lib" "$out/orig_lib"
|
# mv "$out/lib" "$out/orig_lib"
|
||||||
# mv "$out/usr/"* "$out/"
|
mv "$out/usr/"* "$out/"
|
||||||
# mkdir -p "$out/lib/systemd/system/"
|
# mkdir -p "$out/lib/systemd/system/"
|
||||||
# mv "$out/orig_lib/systemd/system/"* "$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/system"
|
||||||
# rmdir "$out/orig_lib/systemd"
|
# rmdir "$out/orig_lib/systemd"
|
||||||
# rmdir "$out/orig_lib"
|
# rmdir "$out/orig_lib"
|
||||||
# rmdir "$out/usr"
|
rmdir "$out/usr"
|
||||||
|
|
||||||
for f in "$out/lib/systemd/system/"*.service; do
|
for f in "$out/lib/systemd/system/"*.service; do
|
||||||
substituteInPlace "$f" \
|
substituteInPlace "$f" \
|
||||||
|
|||||||
Reference in New Issue
Block a user