diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix index 376fe9f64eec..4480d197fa7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -5,6 +5,8 @@ , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd +, audit +, libapparmor , libX11 ? null , libICE ? null , libSM ? null @@ -30,7 +32,13 @@ stdenv.mkDerivation rec { sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = [ + # 'generate.consistent.ids=1' ensures reproducible docs, for further details see + # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html + # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189, + # expected in version 1.14 + ./docs-reproducible-ids.patch + ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch); postPatch = '' substituteInPlace tools/Makefile.in \ @@ -64,7 +72,8 @@ stdenv.mkDerivation rec { libX11 libICE libSM - ] ++ lib.optional enableSystemd systemd; + ] ++ lib.optional enableSystemd systemd + ++ lib.optionals (!stdenv.isDarwin) [ audit libapparmor ]; # ToDo: optional selinux? configureFlags = [ @@ -80,7 +89,8 @@ stdenv.mkDerivation rec { "--with-system-socket=/run/dbus/system_bus_socket" "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" - ] ++ lib.optional (!x11Support) "--without-x"; + ] ++ lib.optional (!x11Support) "--without-x" + ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. |