dbus: split into multiple outputs and fix referrers

This commit is contained in:
Vladimír Čunát 2015-10-13 14:33:08 +02:00
parent ad824a6a30
commit 783c40eb68
42 changed files with 95 additions and 170 deletions

View file

@ -52,7 +52,7 @@ let
${optionalString cfg.startDbusSession ''
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
exec ${pkgs.dbus.tools}/bin/dbus-launch --exit-with-session "$0" "$sessionType"
exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType"
fi
''}

View file

@ -25,8 +25,8 @@ in stdenv.mkDerivation rec {
[ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
"-I${dbus_libs}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ];
"-I${dbus_libs.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it.
PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [

View file

@ -12,10 +12,10 @@ let
NIX_CFLAGS_COMPILE =
"-I${telepathy_glib}/include/telepathy-1.0"
+ " -I${dbus_glib.dev}/include/dbus-1.0"
+ " -I${dbus_libs}/include/dbus-1.0";
+ " -I${dbus_libs.dev}/include/dbus-1.0";
};
telepathy_logger_qt = x : x // {
NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0";
NIX_CFLAGS_COMPILE = "-I${dbus_libs.dev}/include/dbus-1.0";
};
};

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
};
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
gobjectIntrospection dbus_libs ];

View file

@ -85,7 +85,7 @@ in stdenv.mkDerivation {
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
sed -i -e '
s@"libdbus-1\.so\.3"@"${dbus.out}/lib/libdbus-1.so.3"@g
s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g
s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
${optionalString pulseSupport ''
s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g

View file

@ -75,7 +75,7 @@ stdenv.mkDerivation {
for i in lib/VBoxOGL*.so
do
patchelf --set-rpath $out/lib:${dbus}/lib $i
patchelf --set-rpath $out/lib:${dbus.lib}/lib $i
done
# FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
libwebp
];

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
"ac_ct_CXX=foo" ];
NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
patches = [ ./efl-elua.patch ];

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj";
};
buildInputs = [ dbus.libs libgcrypt pam python gtk GConf libgnome_keyring ];
buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ];
propagatedBuildInputs = [ glib libtasn1 ];

View file

@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
file libtool librsvg ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
"-I${dbus_libs}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ];
"-I${dbus_libs.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
preFixup = ''
for f in $out/bin/* $out/libexec/*; do

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
'';

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
};
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
enableParallelBuilding = true;

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ intltool autoreconfHook pkgconfig vala glib
gtk3 gnome3.gnome_control_center dbus.libs
gtk3 gnome3.gnome_control_center dbus
clutter pango appstream-glib makeWrapper ];
preConfigure = "intltoolize -f";

View file

@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
file libtool librsvg ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
"-I${dbus_libs}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ];
"-I${dbus_libs.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
preFixup = ''
for f in $out/bin/* $out/libexec/*; do

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
'';

View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
enableParallelBuilding = true;

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ intltool autoreconfHook pkgconfig vala glib
gtk3 gnome3.gnome_control_center dbus.libs
gtk3 gnome3.gnome_control_center dbus
clutter pango appstream-glib makeWrapper ];
preConfigure = "intltoolize -f";

View file

@ -236,7 +236,7 @@ let
inherit (scope) bash coreutils gnused gnugrep socat;
inherit (scope) kconfig kinit kservice qt5tools;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
dbus_tools = scope.dbus.tools;
inherit (scope.dbus) dbus-launch;
kde_workspace = kdeApps.kde-workspace;
postPatch = ''
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \

View file

@ -180,7 +180,7 @@ index 6f93108..26cc2fc 100644
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+ eval `@dbus-launch@ --sh-syntax --exit-with-session`
+fi
+if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
+ : # ok

View file

@ -180,7 +180,7 @@ index cfbe227..999dd8f 100644
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+ eval `@dbus-launch@ --sh-syntax --exit-with-session`
+fi
+if @qttools@/bin/qdbus >/dev/null 2>/dev/null; then
+ : # ok

View file

@ -44,7 +44,7 @@
, kinit
, kservice
, qttools
, dbus_tools
, dbus
, mkfontdir
, xmessage
, xprop
@ -101,7 +101,8 @@ plasmaPackage {
inherit bash coreutils gnused gnugrep socat;
inherit kconfig kinit kservice qttools;
inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot;
inherit mkfontdir xmessage xprop xrdb xset xsetroot;
inherit (dbus) dbus-launch;
postPatch = ''
substituteAllInPlace startkde/startkde.cmake
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ expat libiconv ];
propagatedBuildInputs = [ dbus.libs glib ];
propagatedBuildInputs = [ dbus glib ];
doCheck = true;

View file

@ -1,5 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
, expat, systemd, glib, dbus_glib, python
{ stdenv, lib, fetchurl, pkgconfig, expat, systemd, glib, dbus_glib, python
, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
assert x11Support -> libX11 != null
@ -10,107 +9,76 @@ let
version = "1.8.20";
sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
inherit (stdenv) lib;
buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ];
# also other parts than "libs" need this statically linked lib
makeInternalLib = "(cd dbus && make libdbus-internal.la)";
systemdOrEmpty = lib.optional stdenv.isLinux systemd;
# A generic builder for individual parts (subdirs) of D-Bus
dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{
name = "dbus-${name}-${version}";
self = stdenv.mkDerivation {
name = "dbus-${version}";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
inherit sha256;
};
patches = [
./ignore-missing-includedirs.patch
./ucred-dirty-hack.patch
./no-create-dirs.patch
]
++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
;
patches = [ ./ignore-missing-includedirs.patch ]
++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
postPatch = ''
substituteInPlace tools/Makefile.in \
--replace 'install-localstatelibDATA:' 'disabled:' \
--replace 'install-data-local:' 'disabled:' \
--replace 'installcheck-local:' 'disabled:'
substituteInPlace bus/Makefile.in \
--replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
'' + /* cleanup of runtime references */ ''
substituteInPlace ./dbus/dbus-sysdeps-unix.c \
--replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
substituteInPlace ./tools/dbus-launch.c \
--replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
'';
# build only the specified subdirs
postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
# use already packaged libdbus instead of trying to build it again
+ lib.optionalString (name != "libs") ''
for mfile in */Makefile.am; do
sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile"
done
'';
outputs = [ "dev" "out" "lib" "doc" ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ expat ];
buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
preConfigure = ''
patchShebangs .
substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
autoreconf -fi
'';
buildInputs = lib.optional stdenv.isLinux systemd
++ lib.optionals x11Support [ libX11 libICE libSM ];
# ToDo: optional selinux?
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
# this package installs nothing into those dirs and they create a dependency
"--datadir=/run/current-system/sw/share"
"--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
] ++ lib.optional (!x11Support) "--without-x";
# 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.
NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
enableParallelBuilding = true;
doCheck = true;
installFlags = "sysconfdir=$(out)/etc";
installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share";
} merge ]);
libs = dbus_drv "libs" "dbus" {
# 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.
NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
buildInputs = [ systemdOrEmpty ];
meta.platforms = stdenv.lib.platforms.all;
};
attrs = rec {
# If you change much fix indentation
# This package has been split because most applications only need dbus.lib
# which serves as an interface to a *system-wide* daemon,
# see e.g. http://en.wikipedia.org/wiki/D-Bus#Architecture .
inherit libs;
tools = dbus_drv "tools" "tools bus" {
preBuild = makeInternalLib;
buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ];
NIX_CFLAGS_LINK =
stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
+ "-ldbus-1";
# don't provide another dbus-1.pc (with incorrect include and link dirs),
# also remove useless empty dirs
postInstall = ''
rm "$out"/lib/pkgconfig/dbus-1.pc
rmdir --parents --ignore-fail-on-non-empty "$out"/{lib/pkgconfig,share/dbus-1/*}
# it's executed from $lib by absolute path
postFixup = ''
_moveToOutput bin/dbus-launch "$lib"
ln -s "$lib/bin/dbus-launch" "$out/bin/"
'';
meta.platforms = with stdenv.lib.platforms; allBut darwin;
passthru = {
dbus-launch = "${self.lib}/bin/dbus-launch";
daemon = self.out;
};
meta = with stdenv.lib; {
description = "Simple interprocess messaging system";
homepage = http://www.freedesktop.org/wiki/Software/dbus/;
license = licenses.gpl2Plus; # most is also under AFL-2.1
platforms = platforms.unix;
};
};
daemon = tools;
docs = dbus_drv "docs" "doc" {
postInstall = ''rm -r "$out/lib"'';
};
};
in attrs.libs // attrs
in self

View file

@ -1,26 +0,0 @@
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 6cbc09a..be60bb8 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -212,7 +212,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/tools/Makefile.am b/tools/Makefile.am
index cfd54b8..b6e28f9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -74,7 +74,7 @@ CLEANFILES = \
# create the /var/lib/dbus directory for dbus-uuidgen
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
+ :
installcheck-local:
- test -d $(DESTDIR)$(localstatedir)/lib/dbus
+ :

View file

@ -1,18 +0,0 @@
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index b4ecc96..267984a 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -1635,6 +1635,13 @@ write_credentials_byte (int server_fd,
}
}
+struct ucred
+{
+ pid_t pid; /* PID of sending process. */
+ uid_t uid; /* UID of sending process. */
+ gid_t gid; /* GID of sending process. */
+};
+
/**
* Reads a single byte which must be nul (an error occurs otherwise),
* and reads unix credentials if available. Clears the credentials

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool libtool ];
buildInputs =
[ makeWrapper glib dbus.libs udev libgudev udisks2 libgcrypt
[ makeWrapper glib dbus udev libgudev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio
libxml2 libxslt docbook_xsl samba libmtp
# ToDo: a ligther version of libsoup to have FTP/HTTP support?

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig glib dbus_glib pam intltool gettext libxslt ];
propagatedBuildInputs = [ expat dbus.libs ];
propagatedBuildInputs = [ expat dbus ];
configureFlags = "--localstatedir=/var --sysconfdir=/etc";

View file

@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs =
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
libSM zlib libpng openssl dbus.libs freetype fontconfig glib ]
libSM zlib libpng openssl dbus freetype fontconfig glib ]
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
++ optional mesaSupported mesa_glu
++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib

View file

@ -71,7 +71,7 @@ stdenv.mkDerivation {
./0006-tzdir.patch
(substituteAll { src = ./0010-dlopen-libXcursor.patch; libXcursor = libXcursor.out; })
(substituteAll { src = ./0011-dlopen-openssl.patch; openssl = openssl.out; })
(substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus.libs.out; })
(substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus.lib; })
./0013-xdg_config_dirs.patch
] ++ optional mesaSupported
(substituteAll { src = ./0014-mkspecs-libgl.patch; mesa_inc = mesa.dev; mesa_lib = mesa.out; })
@ -166,7 +166,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [
xorg.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
zlib libjpeg libpng libtiff sqlite icu
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
]

View file

@ -81,7 +81,7 @@ stdenv.mkDerivation {
};
dlopen-dbus = substituteAll {
src = ./0007-dlopen-dbus.patch;
dbus_libs = dbus.libs.out;
dbus_libs = dbus.lib;
};
xdg-config-dirs = ./0008-xdg-config-dirs.patch;
decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch;
@ -187,7 +187,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
zlib libjpeg libpng libtiff sqlite icu
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
]

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
};
buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
buildInputs = [ pkgconfig glib dbus dbus_glib ];
meta = {
homepage = http://hal.freedesktop.org/releases/;

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "doc" "man" ]; # TODO: above
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
++ optionals stdenv.isLinux [ pam dbus.libs acl ];
++ optionals stdenv.isLinux [ pam dbus acl ];
propagatedBuildInputs = [ gmp ];

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
[ pythonDBus pygobject pygobject3 recursivePthLoader ];
buildInputs =
[ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython
[ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
readline libsndfile udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
[ pythonDBus pygobject pygobject3 recursivePthLoader ];
buildInputs =
[ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython
[ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
readline libsndfile udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper
[ pkgconfig dbus glib libusb alsaLib python makeWrapper
readline libsndfile
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt
, kexectools, libmicrohttpd, linuxHeaders, libseccomp

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ json_c libsndfile speexdsp fftwFloat ]
++ lib.optionals stdenv.isLinux [ glib dbus.libs ]
++ lib.optionals stdenv.isLinux [ glib dbus ]
++ lib.optionals (!libOnly) (
[ libasyncns webrtc-audio-processing ]
++ lib.optional jackaudioSupport libjack2

View file

@ -328,7 +328,7 @@ in
version = (builtins.parseDrvName attrs.name).version;
commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
commonPropagatedBuildInputs = [
args.zlib args.mesa args.dbus.libs
args.zlib args.mesa args.dbus
xf86bigfontproto glproto xf86driproto
compositeproto scrnsaverproto resourceproto
xf86dgaproto

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig
export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
'';
meta = {

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8";
};
buildInputs = [ glib dbus.libs openobex bluez libical ];
buildInputs = [ glib dbus openobex bluez libical ];
nativeBuildInputs = [ pkgconfig ];

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
preConfigure = ''
export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
./autogen.sh #--prefix="$out"
'';

View file

@ -6073,8 +6073,8 @@ let
};
# Should we deprecate these? Currently there are many references.
dbus_tools = pkgs.dbus.tools;
dbus_libs = pkgs.dbus.libs;
dbus_tools = pkgs.dbus.out;
dbus_libs = pkgs.dbus;
dbus_daemon = pkgs.dbus.daemon;
dhex = callPackage ../applications/editors/dhex { };