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

* systemd: fix path to loadkeys/setfont, and add SysV compatibility

Browse Source 
links (reboot/shutdown/etc.).

svn path=/nixpkgs/trunk/; revision=34515
This commit is contained in:
Eelco Dolstra 2012-06-14 22:10:52 +00:00
parent 24ed82236a
commit 44210695c8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ 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, usbutils, pciutils , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
, glib , glib, kbd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
done done
''; '';
NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\"";
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc";
# Get rid of configuration-specific data. # Get rid of configuration-specific data.
@ -50,6 +52,13 @@ stdenv.mkDerivation rec {
mkdir -p $out/example/systemd mkdir -p $out/example/systemd
mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
mv $out/lib/systemd/{system,user} $out/example/systemd mv $out/lib/systemd/{system,user} $out/example/systemd
# Install SysV compatibility commands.
mkdir -p $out/sbin
ln -s $out/lib/systemd/systemd $out/sbin/telinit
for i in init halt poweroff runlevel reboot shutdown; do
ln -s $out/bin/systemctl $out/sbin/$i
done
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;