systemd: 234 -> 237
Co-Authored-By: Florian Klink <flokli@flokli.de> Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
This commit is contained in:
Franz Pletz
parent
0bf153f9c0
commit
eb862c48dd
|
|
@ -700,7 +700,6 @@ in
|
||||||
|
|
||||||
systemd.additionalUpstreamSystemUnits = [
|
systemd.additionalUpstreamSystemUnits = [
|
||||||
"systemd-networkd.service" "systemd-networkd-wait-online.service"
|
"systemd-networkd.service" "systemd-networkd-wait-online.service"
|
||||||
"org.freedesktop.network1.busname"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
|
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
systemd.additionalUpstreamSystemUnits = [
|
systemd.additionalUpstreamSystemUnits = [
|
||||||
"systemd-resolved.service" "org.freedesktop.resolve1.busname"
|
"systemd-resolved.service"
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.services.systemd-resolved = {
|
systemd.services.systemd-resolved = {
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ let
|
||||||
upstreamSystemUnits =
|
upstreamSystemUnits =
|
||||||
[ # Targets.
|
[ # Targets.
|
||||||
"basic.target"
|
"basic.target"
|
||||||
"busnames.target"
|
|
||||||
"sysinit.target"
|
"sysinit.target"
|
||||||
"sockets.target"
|
"sockets.target"
|
||||||
"exit.target"
|
"exit.target"
|
||||||
|
|
@ -47,6 +46,7 @@ let
|
||||||
|
|
||||||
# Consoles.
|
# Consoles.
|
||||||
"getty.target"
|
"getty.target"
|
||||||
|
"getty-pre.target"
|
||||||
"getty@.service"
|
"getty@.service"
|
||||||
"serial-getty@.service"
|
"serial-getty@.service"
|
||||||
"console-getty.service"
|
"console-getty.service"
|
||||||
|
|
@ -63,10 +63,7 @@ let
|
||||||
"systemd-logind.service"
|
"systemd-logind.service"
|
||||||
"autovt@.service"
|
"autovt@.service"
|
||||||
"systemd-user-sessions.service"
|
"systemd-user-sessions.service"
|
||||||
"dbus-org.freedesktop.login1.service"
|
|
||||||
"dbus-org.freedesktop.machine1.service"
|
"dbus-org.freedesktop.machine1.service"
|
||||||
"org.freedesktop.login1.busname"
|
|
||||||
"org.freedesktop.machine1.busname"
|
|
||||||
"user@.service"
|
"user@.service"
|
||||||
|
|
||||||
# Journal.
|
# Journal.
|
||||||
|
|
@ -99,7 +96,6 @@ let
|
||||||
"swap.target"
|
"swap.target"
|
||||||
"dev-hugepages.mount"
|
"dev-hugepages.mount"
|
||||||
"dev-mqueue.mount"
|
"dev-mqueue.mount"
|
||||||
"proc-sys-fs-binfmt_misc.mount"
|
|
||||||
"sys-fs-fuse-connections.mount"
|
"sys-fs-fuse-connections.mount"
|
||||||
"sys-kernel-config.mount"
|
"sys-kernel-config.mount"
|
||||||
"sys-kernel-debug.mount"
|
"sys-kernel-debug.mount"
|
||||||
|
|
@ -155,19 +151,16 @@ let
|
||||||
"systemd-tmpfiles-setup-dev.service"
|
"systemd-tmpfiles-setup-dev.service"
|
||||||
|
|
||||||
# Misc.
|
# Misc.
|
||||||
"org.freedesktop.systemd1.busname"
|
|
||||||
"systemd-sysctl.service"
|
"systemd-sysctl.service"
|
||||||
"dbus-org.freedesktop.timedate1.service"
|
"dbus-org.freedesktop.timedate1.service"
|
||||||
"dbus-org.freedesktop.locale1.service"
|
"dbus-org.freedesktop.locale1.service"
|
||||||
"dbus-org.freedesktop.hostname1.service"
|
"dbus-org.freedesktop.hostname1.service"
|
||||||
"org.freedesktop.timedate1.busname"
|
|
||||||
"org.freedesktop.locale1.busname"
|
|
||||||
"org.freedesktop.hostname1.busname"
|
|
||||||
"systemd-timedated.service"
|
"systemd-timedated.service"
|
||||||
"systemd-localed.service"
|
"systemd-localed.service"
|
||||||
"systemd-hostnamed.service"
|
"systemd-hostnamed.service"
|
||||||
"systemd-binfmt.service"
|
"systemd-binfmt.service"
|
||||||
"systemd-exit.service"
|
"systemd-exit.service"
|
||||||
|
"systemd-update-done.service"
|
||||||
]
|
]
|
||||||
++ cfg.additionalUpstreamSystemUnits;
|
++ cfg.additionalUpstreamSystemUnits;
|
||||||
|
|
||||||
|
|
@ -182,7 +175,6 @@ let
|
||||||
upstreamUserUnits =
|
upstreamUserUnits =
|
||||||
[ "basic.target"
|
[ "basic.target"
|
||||||
"bluetooth.target"
|
"bluetooth.target"
|
||||||
"busnames.target"
|
|
||||||
"default.target"
|
"default.target"
|
||||||
"exit.target"
|
"exit.target"
|
||||||
"graphical-session-pre.target"
|
"graphical-session-pre.target"
|
||||||
|
|
@ -789,8 +781,7 @@ in
|
||||||
|
|
||||||
# Keep a persistent journal. Note that systemd-tmpfiles will
|
# Keep a persistent journal. Note that systemd-tmpfiles will
|
||||||
# set proper ownership/permissions.
|
# set proper ownership/permissions.
|
||||||
# FIXME: revert to 0700 with systemd v233.
|
mkdir -m 0700 -p /var/log/journal
|
||||||
mkdir -m 0750 -p /var/log/journal
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
|
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
|
||||||
|
|
@ -887,7 +878,7 @@ in
|
||||||
systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
|
systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
|
||||||
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
|
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
|
||||||
systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
|
systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
|
||||||
systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];
|
systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ];
|
||||||
|
|
||||||
# Don't bother with certain units in containers.
|
# Don't bother with certain units in containers.
|
||||||
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
|
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
|
||||||
|
|
|
||||||
|
|
@ -1,194 +1,223 @@
|
||||||
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
|
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
|
||||||
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
|
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
|
||||||
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
|
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
|
||||||
, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
|
, audit, lz4, bzip2, kexectools, libmicrohttpd
|
||||||
, iptables, gnu-efi
|
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
|
||||||
|
, libseccomp, iptables, gnu-efi
|
||||||
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
|
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
|
||||||
|
, ninja, meson, python3Packages, glibcLocales
|
||||||
|
, patchelf
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert stdenv.isLinux;
|
assert stdenv.isLinux;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
|
||||||
version = "234";
|
|
||||||
name = "systemd-${version}";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
in
|
||||||
owner = "nixos";
|
|
||||||
repo = "systemd";
|
|
||||||
rev = "eef5613fda5";
|
|
||||||
sha256 = "0wgh5y319v56hcs82mhs58ipb100cz4x41vz3kh4bq1n7sx88cdz";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "lib" "man" "dev" ];
|
stdenv.mkDerivation rec {
|
||||||
|
version = "237";
|
||||||
|
name = "systemd-${version}";
|
||||||
|
|
||||||
nativeBuildInputs =
|
src = fetchFromGitHub {
|
||||||
[ pkgconfig intltool gperf libxslt
|
owner = "NixOS";
|
||||||
/* FIXME: we may be able to prevent the following dependencies
|
repo = "systemd";
|
||||||
by generating an autoconf'd tarball, but that's probably not
|
rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792";
|
||||||
worth it. */
|
sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq";
|
||||||
autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
|
};
|
||||||
];
|
|
||||||
buildInputs =
|
|
||||||
[ linuxHeaders libcap kmod xz pam acl
|
|
||||||
/* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror
|
|
||||||
libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor
|
|
||||||
iptables gnu-efi
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags =
|
outputs = [ "out" "lib" "man" "dev" ];
|
||||||
[ "--localstatedir=/var"
|
|
||||||
"--sysconfdir=/etc"
|
|
||||||
"--with-rootprefix=$(out)"
|
|
||||||
"--with-kbd-loadkeys=${kbd}/bin/loadkeys"
|
|
||||||
"--with-kbd-setfont=${kbd}/bin/setfont"
|
|
||||||
"--with-rootprefix=$(out)"
|
|
||||||
"--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
|
|
||||||
"--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
|
|
||||||
"--with-dbussessionservicedir=$(out)/share/dbus-1/services"
|
|
||||||
"--with-tty-gid=3" # tty in NixOS has gid 3
|
|
||||||
"--disable-tests"
|
|
||||||
|
|
||||||
"--enable-lz4"
|
nativeBuildInputs =
|
||||||
"--enable-hostnamed"
|
[ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
|
||||||
"--enable-networkd"
|
ninja meson
|
||||||
"--disable-sysusers"
|
coreutils # meson calls date, stat etc.
|
||||||
"--enable-timedated"
|
pythonLxmlEnv glibcLocales
|
||||||
"--enable-timesyncd"
|
patchelf
|
||||||
"--disable-firstboot"
|
];
|
||||||
"--enable-localed"
|
buildInputs =
|
||||||
"--enable-resolved"
|
[ linuxHeaders libcap kmod xz pam acl
|
||||||
"--disable-split-usr"
|
/* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2
|
||||||
"--disable-libcurl"
|
libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
|
||||||
"--disable-libidn"
|
iptables gnu-efi
|
||||||
"--disable-quotacheck"
|
];
|
||||||
"--disable-ldconfig"
|
|
||||||
"--disable-smack"
|
|
||||||
|
|
||||||
(if stdenv.isArm then "--disable-gnuefi" else "--enable-gnuefi")
|
#dontAddPrefix = true;
|
||||||
"--with-efi-libdir=${gnu-efi}/lib"
|
|
||||||
"--with-efi-includedir=${gnu-efi}/include"
|
|
||||||
"--with-efi-ldsdir=${gnu-efi}/lib"
|
|
||||||
|
|
||||||
"--with-sysvinit-path="
|
mesonFlags = [
|
||||||
"--with-sysvrcnd-path="
|
"-Dloadkeys-path=${kbd}/bin/loadkeys"
|
||||||
"--with-rc-local-script-path-stop=/etc/halt.local"
|
"-Dsetfont-path=${kbd}/bin/setfont"
|
||||||
];
|
"-Dtty-gid=3" # tty in NixOS has gid 3
|
||||||
|
# "-Dtests=" # TODO
|
||||||
|
"-Dlz4=true"
|
||||||
|
"-Dhostnamed=true"
|
||||||
|
"-Dnetworkd=true"
|
||||||
|
"-Dsysusers=false"
|
||||||
|
"-Dtimedated=true"
|
||||||
|
"-Dtimesyncd=true"
|
||||||
|
"-Dfirstboot=false"
|
||||||
|
"-Dlocaled=true"
|
||||||
|
"-Dresolve=true"
|
||||||
|
"-Dsplit-usr=false"
|
||||||
|
"-Dlibcurl=false"
|
||||||
|
"-Dlibidn=false"
|
||||||
|
"-Dlibidn2=true"
|
||||||
|
"-Dquotacheck=false"
|
||||||
|
"-Dldconfig=false"
|
||||||
|
"-Dsmack=true"
|
||||||
|
"-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work
|
||||||
|
"-Dsystem-gid-max=499"
|
||||||
|
# "-Dtime-epoch=1"
|
||||||
|
|
||||||
hardeningDisable = [ "stackprotector" ];
|
(if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true")
|
||||||
|
"-Defi-libdir=${gnu-efi}/lib"
|
||||||
|
"-Defi-includedir=${gnu-efi}/include/efi"
|
||||||
|
"-Defi-ldsdir=${gnu-efi}/lib"
|
||||||
|
|
||||||
patches = [
|
"-Dsysvinit-path="
|
||||||
# TODO: Remove this patch when we have a systemd version
|
"-Dsysvrcnd-path="
|
||||||
# with https://github.com/systemd/systemd/pull/6678
|
];
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch";
|
|
||||||
sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
''
|
''
|
||||||
unset RANLIB
|
mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
|
||||||
|
mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
|
||||||
|
mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
|
||||||
|
mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
|
||||||
|
mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
|
||||||
|
mesonFlagsArray+=(-Dsysconfdir=$out/etc)
|
||||||
|
mesonFlagsArray+=(-Drootprefix=$out)
|
||||||
|
mesonFlagsArray+=(-Dlibdir=$lib/lib)
|
||||||
|
mesonFlagsArray+=(-Drootlibdir=$lib/lib)
|
||||||
|
mesonFlagsArray+=(-Dmandir=$man/lib)
|
||||||
|
mesonFlagsArray+=(-Dincludedir=$dev/include)
|
||||||
|
mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
|
||||||
|
mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
|
||||||
|
|
||||||
./autogen.sh
|
# FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
|
||||||
|
substituteInPlace meson.build \
|
||||||
|
--replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
|
||||||
|
"includedir = '$dev/include'" \
|
||||||
|
--replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
|
||||||
|
"libdir = '$lib/lib'"
|
||||||
|
|
||||||
# FIXME: patch this in systemd properly (and send upstream).
|
export LC_ALL="en_US.UTF-8";
|
||||||
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
|
# FIXME: patch this in systemd properly (and send upstream).
|
||||||
test -e $i
|
# already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
|
||||||
substituteInPlace $i \
|
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
|
||||||
--replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \
|
test -e $i
|
||||||
--replace /bin/mount ${utillinux.bin}/bin/mount \
|
substituteInPlace $i \
|
||||||
--replace /bin/umount ${utillinux.bin}/bin/umount \
|
--replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \
|
||||||
--replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
|
--replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
|
||||||
--replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
|
--replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
|
||||||
--replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
|
--replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
|
||||||
--replace /bin/echo ${coreutils}/bin/echo \
|
--replace /bin/echo ${coreutils}/bin/echo \
|
||||||
--replace /bin/cat ${coreutils}/bin/cat \
|
--replace /bin/cat ${coreutils}/bin/cat \
|
||||||
--replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
|
--replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
|
||||||
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
|
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
|
||||||
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
|
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
|
||||||
done
|
done
|
||||||
|
|
||||||
substituteInPlace src/journal/catalog.c \
|
for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do
|
||||||
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
|
substituteInPlace $i \
|
||||||
|
--replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"
|
||||||
|
done
|
||||||
|
|
||||||
configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
|
for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
|
||||||
|
substituteInPlace $i \
|
||||||
|
--replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python"
|
||||||
|
done
|
||||||
|
|
||||||
|
substituteInPlace src/journal/catalog.c \
|
||||||
|
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
|
||||||
|
'';
|
||||||
|
|
||||||
|
# These defines are overridden by CFLAGS and would trigger annoying
|
||||||
|
# warning messages
|
||||||
|
postConfigure = ''
|
||||||
|
substituteInPlace config.h \
|
||||||
|
--replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
|
||||||
|
--replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
|
||||||
|
--replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
|
hardeningDisable = [ "stackprotector" ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE =
|
NIX_CFLAGS_COMPILE =
|
||||||
[ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
|
[ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
|
||||||
# lead to a cyclic dependency.
|
# lead to a cyclic dependency.
|
||||||
"-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
|
"-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
|
||||||
"-fno-stack-protector"
|
|
||||||
|
|
||||||
# Set the release_agent on /sys/fs/cgroup/systemd to the
|
# Set the release_agent on /sys/fs/cgroup/systemd to the
|
||||||
# currently running systemd (/run/current-system/systemd) so
|
# currently running systemd (/run/current-system/systemd) so
|
||||||
# that we don't use an obsolete/garbage-collected release agent.
|
# that we don't use an obsolete/garbage-collected release agent.
|
||||||
"-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
|
"-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
|
||||||
|
|
||||||
"-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
|
"-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
|
||||||
];
|
];
|
||||||
|
|
||||||
installFlags =
|
postInstall =
|
||||||
[ "localstatedir=$(TMPDIR)/var"
|
''
|
||||||
"sysconfdir=$(out)/etc"
|
# sysinit.target: Don't depend on
|
||||||
"sysvinitdir=$(TMPDIR)/etc/init.d"
|
# systemd-tmpfiles-setup.service. This interferes with NixOps's
|
||||||
"pamconfdir=$(out)/etc/pam.d"
|
# send-keys feature (since sshd.service depends indirectly on
|
||||||
];
|
# sysinit.target).
|
||||||
|
mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
|
||||||
|
|
||||||
postInstall =
|
mkdir -p $out/example/systemd
|
||||||
''
|
mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
|
||||||
# sysinit.target: Don't depend on
|
mv $out/lib/systemd/{system,user} $out/example/systemd
|
||||||
# systemd-tmpfiles-setup.service. This interferes with NixOps's
|
|
||||||
# send-keys feature (since sshd.service depends indirectly on
|
|
||||||
# sysinit.target).
|
|
||||||
mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
|
|
||||||
|
|
||||||
mkdir -p $out/example/systemd
|
rm -rf $out/etc/systemd/system
|
||||||
mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
|
|
||||||
mv $out/lib/systemd/{system,user} $out/example/systemd
|
|
||||||
|
|
||||||
rm -rf $out/etc/systemd/system
|
# 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
|
||||||
|
|
||||||
# Install SysV compatibility commands.
|
# Fix reference to /bin/false in the D-Bus services.
|
||||||
mkdir -p $out/sbin
|
for i in $out/share/dbus-1/system-services/*.service; do
|
||||||
ln -s $out/lib/systemd/systemd $out/sbin/telinit
|
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
|
||||||
for i in init halt poweroff runlevel reboot shutdown; do
|
done
|
||||||
ln -s $out/bin/systemctl $out/sbin/$i
|
|
||||||
|
rm -rf $out/etc/rpm
|
||||||
|
|
||||||
|
# "kernel-install" shouldn't be used on NixOS.
|
||||||
|
find $out -name "*kernel-install*" -exec rm {} \;
|
||||||
|
|
||||||
|
# Keep only libudev and libsystemd in the lib output.
|
||||||
|
mkdir -p $out/lib
|
||||||
|
mv $lib/lib/security $lib/lib/libnss* $out/lib/
|
||||||
|
''; # */
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
# The rpath to the shared systemd library is not added by meson. The
|
||||||
|
# functionality was removed by a nixpkgs patch because it would overwrite
|
||||||
|
# the existing rpath.
|
||||||
|
postFixup = ''
|
||||||
|
sharedLib=libsystemd-shared-${version}.so
|
||||||
|
for prog in `find $out -type f -executable`; do
|
||||||
|
(patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
|
||||||
|
patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
|
||||||
|
) || true
|
||||||
done
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
# Fix reference to /bin/false in the D-Bus services.
|
# The interface version prevents NixOS from switching to an
|
||||||
for i in $out/share/dbus-1/system-services/*.service; do
|
# incompatible systemd at runtime. (Switching across reboots is
|
||||||
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
|
# fine, of course.) It should be increased whenever systemd changes
|
||||||
done
|
# in a backwards-incompatible way. If the interface version of two
|
||||||
|
# systemd builds is the same, then we can switch between them at
|
||||||
|
# runtime; otherwise we can't and we need to reboot.
|
||||||
|
passthru.interfaceVersion = 2;
|
||||||
|
|
||||||
rm -rf $out/etc/rpm
|
meta = {
|
||||||
|
homepage = http://www.freedesktop.org/wiki/Software/systemd;
|
||||||
rm $lib/lib/*.la
|
description = "A system and service manager for Linux";
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
# "kernel-install" shouldn't be used on NixOS.
|
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||||
find $out -name "*kernel-install*" -exec rm {} \;
|
};
|
||||||
|
|
||||||
# Keep only libudev and libsystemd in the lib output.
|
|
||||||
mkdir -p $out/lib
|
|
||||||
mv $lib/lib/security $lib/lib/libnss* $out/lib/
|
|
||||||
''; # */
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
# The interface version prevents NixOS from switching to an
|
|
||||||
# incompatible systemd at runtime. (Switching across reboots is
|
|
||||||
# fine, of course.) It should be increased whenever systemd changes
|
|
||||||
# in a backwards-incompatible way. If the interface version of two
|
|
||||||
# systemd builds is the same, then we can switch between them at
|
|
||||||
# runtime; otherwise we can't and we need to reboot.
|
|
||||||
passthru.interfaceVersion = 2;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://www.freedesktop.org/wiki/Software/systemd;
|
|
||||||
description = "A system and service manager for Linux";
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user