forked from mirrors/nixpkgs
systemd: fix cycles by adding gudev to libudev
Also some related fixups.
This commit is contained in:
parent
65ac24c903
commit
4b1392fb07
|
@ -151,14 +151,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
rm -rf $out/etc/rpm
|
||||
|
||||
# Move libudev to a separate output.
|
||||
mkdir -p $libudev/lib/pkgconfig $libudev/include
|
||||
mv $out/lib/libudev* $libudev/lib/
|
||||
mv $out/lib/pkgconfig/libudev*.pc $libudev/lib/pkgconfig/
|
||||
mv $out/include/libudev.h $libudev/include/
|
||||
# Move lib(g)udev to a separate output. TODO: maybe split them up
|
||||
# to avoid libudev pulling glib
|
||||
mkdir -p "$libudev/lib"
|
||||
mv "$out"/lib/lib{,g}udev* "$libudev/lib/"
|
||||
|
||||
for i in $libudev/lib/*.la $libudev/lib/pkgconfig/*.pc; do
|
||||
substituteInPlace $i --replace $out $libudev
|
||||
for i in "$libudev"/lib/*.la "$out"/lib/pkgconfig/*udev*.pc; do
|
||||
substituteInPlace $i --replace "$out" "$libudev"
|
||||
done
|
||||
''; # */
|
||||
|
||||
|
|
Loading…
Reference in a new issue