diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-25 18:42:56 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-25 18:42:56 +0200 |
| commit | 552fd3d599851336aa21ef073d1f7836566e454f (patch) | |
| tree | b2ebdeaa32426d12e21020410a0eb1a12881f8f6 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | cc61d31902d67b94333f53a5ab5772330bbc21cc (diff) | |
| parent | 9dc35999602bc3bf2d7358a9ff79b9530e8d1975 (diff) | |
| download | nixlib-552fd3d599851336aa21ef073d1f7836566e454f.tar nixlib-552fd3d599851336aa21ef073d1f7836566e454f.tar.gz nixlib-552fd3d599851336aa21ef073d1f7836566e454f.tar.bz2 nixlib-552fd3d599851336aa21ef073d1f7836566e454f.tar.lz nixlib-552fd3d599851336aa21ef073d1f7836566e454f.tar.xz nixlib-552fd3d599851336aa21ef073d1f7836566e454f.tar.zst nixlib-552fd3d599851336aa21ef073d1f7836566e454f.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/atk/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/gmime/default.nix pkgs/development/libraries/pango/default.nix pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2a34600529dc..e7184aa27b96 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,10 +3,11 @@ , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl }: -assert stdenv.gcc.libc or null != null; +assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "systemd-203"; + version = "203"; + name = "systemd-${version}"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; buildInputs = - [ pkgconfig intltool gperf libcap dbus kmod xz pam acl + [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl ]; @@ -125,6 +126,19 @@ stdenv.mkDerivation rec { # runtime; otherwise we can't and we need to reboot. passthru.interfaceVersion = 2; + passthru.headers = stdenv.mkDerivation { + name = "systemd-headers-${version}"; + inherit src; + + phases = [ "unpackPhase" "installPhase" ]; + + # some are needed by dbus.libs, which is needed for systemd :-) + installPhase = '' + mkdir -p "$out/include/systemd" + mv src/systemd/*.h "$out/include/systemd" + ''; + }; + meta = { homepage = "http://www.freedesktop.org/wiki/Software/systemd"; description = "A system and service manager for Linux"; |