systemd: fix cycles by adding gudev to libudev

Also some related fixups.
This commit is contained in:
Vladimír Čunát 2015-04-18 19:53:59 +02:00
parent 65ac24c903
commit 4b1392fb07

View File

@ -151,14 +151,13 @@ stdenv.mkDerivation rec {
rm -rf $out/etc/rpm rm -rf $out/etc/rpm
# Move libudev to a separate output. # Move lib(g)udev to a separate output. TODO: maybe split them up
mkdir -p $libudev/lib/pkgconfig $libudev/include # to avoid libudev pulling glib
mv $out/lib/libudev* $libudev/lib/ mkdir -p "$libudev/lib"
mv $out/lib/pkgconfig/libudev*.pc $libudev/lib/pkgconfig/ mv "$out"/lib/lib{,g}udev* "$libudev/lib/"
mv $out/include/libudev.h $libudev/include/
for i in $libudev/lib/*.la $libudev/lib/pkgconfig/*.pc; do for i in "$libudev"/lib/*.la "$out"/lib/pkgconfig/*udev*.pc; do
substituteInPlace $i --replace $out $libudev substituteInPlace $i --replace "$out" "$libudev"
done done
''; # */ ''; # */