From ab7d7333be9edabc4dc82b6b23aa05a9732c1998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 14:59:32 +0200 Subject: [PATCH] dbus: attempt to fix build on FreeBSD and Darwin Also build it there. --- pkgs/development/libraries/dbus/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index b7f7eac3046..4418e6a2ebc 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -13,7 +13,7 @@ let # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; - systemdOrEmpty = stdenv.lib.optional stdenv.isLinux systemd; + 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 [{ @@ -42,10 +42,9 @@ let doCheck = true; - patches = [ - ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch - ./ucred-dirty-hack.patch ./no-create-dirs.patch - ]; + patches = [ ./ignore-missing-includedirs.patch ] + ++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch + ++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ expat ]; @@ -85,6 +84,8 @@ in rec { configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ]; NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; + + meta.platforms = stdenv.lib.platforms.all; }; daemon = dbus_drv "daemon" "bus" {