|
|
@ -8,42 +8,26 @@ |
|
|
|
, systemd |
|
|
|
, systemd |
|
|
|
, audit |
|
|
|
, audit |
|
|
|
, libapparmor |
|
|
|
, libapparmor |
|
|
|
, libX11 ? null |
|
|
|
|
|
|
|
, libICE ? null |
|
|
|
|
|
|
|
, libSM ? null |
|
|
|
|
|
|
|
, x11Support ? (stdenv.isLinux || stdenv.isDarwin) |
|
|
|
|
|
|
|
, dbus |
|
|
|
, dbus |
|
|
|
, docbook_xml_dtd_44 |
|
|
|
, docbook_xml_dtd_44 |
|
|
|
, docbook-xsl-nons |
|
|
|
, docbook-xsl-nons |
|
|
|
, xmlto |
|
|
|
, xmlto |
|
|
|
, autoreconfHook |
|
|
|
, autoreconfHook |
|
|
|
, autoconf-archive |
|
|
|
, autoconf-archive |
|
|
|
|
|
|
|
, x11Support ? (stdenv.isLinux || stdenv.isDarwin) |
|
|
|
|
|
|
|
, xorg |
|
|
|
}: |
|
|
|
}: |
|
|
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec { |
|
|
|
stdenv.mkDerivation rec { |
|
|
|
pname = "dbus"; |
|
|
|
pname = "dbus"; |
|
|
|
version = "1.12.20"; |
|
|
|
version = "1.14.0"; |
|
|
|
|
|
|
|
|
|
|
|
src = fetchurl { |
|
|
|
src = fetchurl { |
|
|
|
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; |
|
|
|
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; |
|
|
|
sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; |
|
|
|
sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q="; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
patches = [ |
|
|
|
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 |
|
|
|
|
|
|
|
# AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems |
|
|
|
|
|
|
|
# to provide valid pkg-config files. This replace AC_PATH_XTRA with |
|
|
|
|
|
|
|
# PKG_CHECK_MODULES. |
|
|
|
|
|
|
|
# MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f |
|
|
|
|
|
|
|
(fetchpatch { |
|
|
|
|
|
|
|
url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch"; |
|
|
|
|
|
|
|
sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2"; |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS. |
|
|
|
# Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS. |
|
|
|
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302 |
|
|
|
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302 |
|
|
|
(fetchpatch { |
|
|
|
(fetchpatch { |
|
|
@ -68,6 +52,7 @@ stdenv.mkDerivation rec { |
|
|
|
|
|
|
|
|
|
|
|
outputs = [ "out" "dev" "lib" "doc" "man" ]; |
|
|
|
outputs = [ "out" "dev" "lib" "doc" "man" ]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
strictDeps = true; |
|
|
|
nativeBuildInputs = [ |
|
|
|
nativeBuildInputs = [ |
|
|
|
autoreconfHook |
|
|
|
autoreconfHook |
|
|
|
autoconf-archive |
|
|
|
autoconf-archive |
|
|
@ -82,11 +67,11 @@ stdenv.mkDerivation rec { |
|
|
|
]; |
|
|
|
]; |
|
|
|
|
|
|
|
|
|
|
|
buildInputs = |
|
|
|
buildInputs = |
|
|
|
lib.optionals x11Support [ |
|
|
|
lib.optionals x11Support (with xorg; [ |
|
|
|
libX11 |
|
|
|
libX11 |
|
|
|
libICE |
|
|
|
libICE |
|
|
|
libSM |
|
|
|
libSM |
|
|
|
] ++ lib.optional enableSystemd systemd |
|
|
|
]) ++ lib.optional enableSystemd systemd |
|
|
|
++ lib.optionals stdenv.isLinux [ audit libapparmor ]; |
|
|
|
++ lib.optionals stdenv.isLinux [ audit libapparmor ]; |
|
|
|
# ToDo: optional selinux? |
|
|
|
# ToDo: optional selinux? |
|
|
|
|
|
|
|
|
|
|
@ -104,7 +89,8 @@ stdenv.mkDerivation rec { |
|
|
|
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" |
|
|
|
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" |
|
|
|
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" |
|
|
|
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" |
|
|
|
] ++ lib.optional (!x11Support) "--without-x" |
|
|
|
] ++ lib.optional (!x11Support) "--without-x" |
|
|
|
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]; |
|
|
|
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] |
|
|
|
|
|
|
|
++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemd}/bin/systemctl" ]; |
|
|
|
|
|
|
|
|
|
|
|
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; |
|
|
|
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; |
|
|
|
|
|
|
|
|
|
|
|