From 4b1392fb077973114c581b4f08be75aa17836c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 19:53:59 +0200
Subject: [PATCH] systemd: fix cycles by adding gudev to libudev

Also some related fixups.
---
 pkgs/os-specific/linux/systemd/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index beee7ff3d5e..c10d53c5c75 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -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
     ''; # */