diff --git a/systemd/default.nix b/systemd/default.nix index 653296d..99e4684 100644 --- a/systemd/default.nix +++ b/systemd/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GvRn55grHWR6M+tA86RMzqinuXNpPZzRB4ApuGN/ZvU="; }; + dontCheckForBrokenSymlinks = true; + patches = [ ./0017-meson.build-do-not-create-systemdstatedir.patch ]; @@ -160,12 +162,18 @@ stdenv.mkDerivation (finalAttrs: { # trigger the test -n "$DESTDIR" || mutate in upstreams build system preInstall = '' - export DESTDIR=/ + export DESTDIR=${placeholder "out"} ''; mesonFlags = [ - "--prefix=${placeholder "out"}" + "--prefix=/usr" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--libdir=/usr/lib" + "--bindir=/bin" + "--includedir=/usr/include" + "--localedir=/usr/share/locale" # Options @@ -182,16 +190,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "mode" "release") (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 - (lib.mesonOption "debug-shell" "${pkgs.bashInteractive}/bin/bash") - (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d") - (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d") - (lib.mesonOption "kmod-path" "${pkgs.kmod}/bin/kmod") - (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") - (lib.mesonOption "dbussessionservicedir" "${placeholder "out"}/share/dbus-1/services") - (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") - # pkgconfig - (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig") - (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig") + (lib.mesonOption "kmod-path" "/bin/kmod") # SBAT (lib.mesonOption "sbat-distro" "patos") @@ -249,13 +248,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "remote" false) (lib.mesonEnable "microhttpd" false) - (lib.mesonEnable "pam" true) + (lib.mesonEnable "pam" false) (lib.mesonEnable "acl" true) (lib.mesonEnable "audit" true) (lib.mesonEnable "apparmor" true) (lib.mesonEnable "gcrypt" true) (lib.mesonEnable "importd" true) - (lib.mesonEnable "homed" true) + (lib.mesonEnable "homed" false) (lib.mesonEnable "polkit" true) (lib.mesonEnable "elfutils" true) (lib.mesonEnable "libcurl" true) @@ -264,6 +263,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "libiptc" true) (lib.mesonEnable "repart" true) (lib.mesonEnable "sysupdate" true) + (lib.mesonEnable "sysupdated" true) (lib.mesonEnable "seccomp" true) (lib.mesonEnable "selinux" true) (lib.mesonEnable "tpm2" true) @@ -273,16 +273,16 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "ukify" true) (lib.mesonEnable "kmod" true) (lib.mesonEnable "qrencode" true) - (lib.mesonEnable "vmspawn" true) + (lib.mesonEnable "vmspawn" false) (lib.mesonEnable "libarchive" true) (lib.mesonEnable "xenctrl" false) (lib.mesonEnable "gnutls" false) (lib.mesonEnable "xkbcommon" false) - (lib.mesonEnable "man" true) + (lib.mesonEnable "man" false) (lib.mesonBool "analyze" true) - (lib.mesonBool "logind" true) - (lib.mesonBool "localed" true) + (lib.mesonBool "logind" false) + (lib.mesonBool "localed" false) (lib.mesonBool "hostnamed" true) (lib.mesonBool "machined" true) (lib.mesonBool "networkd" true) @@ -291,7 +291,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "hwdb" true) (lib.mesonBool "timedated" true) (lib.mesonBool "timesyncd" true) - (lib.mesonBool "userdb" true) + (lib.mesonBool "userdb" false) (lib.mesonBool "coredump" true) (lib.mesonBool "firstboot" true) (lib.mesonBool "resolve" true) @@ -303,8 +303,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "kernel-install" true) (lib.mesonBool "quotacheck" false) (lib.mesonBool "ldconfig" false) - (lib.mesonBool "install-sysconfdir" false) - (lib.mesonBool "create-log-dirs" false) + (lib.mesonBool "install-sysconfdir" true) + (lib.mesonBool "create-log-dirs" true) (lib.mesonBool "smack" true) (lib.mesonBool "b_pie" true) diff --git a/systemd/result b/systemd/result deleted file mode 120000 index f1d0e21..0000000 --- a/systemd/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/jw8923rfwly76yb8ynp5r65cvg4g9m0f-systemd-257.3 \ No newline at end of file