JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Updated systemd to 185 (which I overlooked because of the version

Browse Source 
jump).  This contains the merged udev.

svn path=/nixpkgs/trunk/; revision=34371
This commit is contained in:
Eelco Dolstra 2012-06-06 16:07:30 +00:00
parent 36667965f9
commit e9a003e3a2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/os-specific/linux/systemd/default.nix
View File

@ -1,17 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux }: , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
, glib
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "systemd-44"; name = "systemd-185";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
sha256 = "0g138b5yvn419xqrakpk75q2sb4g7pj10br9b6zq4flb9d5sqnks"; sha256 = "1iwp41xvpq0x2flhhs8lpyjbfyg1220ahmy7037zdjy26w9g82br";
}; };
buildInputs = buildInputs =
[ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl
cryptsetup libuuid m4 cryptsetup libuuid m4 usbutils pciutils glib
]; ];
configureFlags = configureFlags =
@ -28,10 +30,15 @@ stdenv.mkDerivation rec {
preConfigure = preConfigure =
'' ''
for i in units/remount-rootfs.service src/remount-api-vfs.c src/mount.c; do # FIXME: patch this in systemd properly (and send upstream).
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c; do
test -e $i
substituteInPlace $i \ substituteInPlace $i \
--replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount --replace /bin/umount ${utillinux}/bin/umount \
--replace /sbin/swapon ${utillinux}/sbin/swapon \
--replace /sbin/swapoff ${utillinux}/sbin/swapoff \
--replace /sbin/fsck ${utillinux}/sbin/fsck
done done
''; '';