From ac39ba7953daf369e266363ae8bd9df4e9e3c5d8 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 7 Sep 2013 07:36:30 +1000 Subject: [PATCH] dbus_tools: fix build on darwin (close #929) --- pkgs/development/libraries/dbus/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index d50a0076e62..4063d34491d 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool , expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? stdenv.isLinux }: +, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8 @@ -83,7 +83,9 @@ in rec { tools = dbus_drv "tools" "tools" { configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ]; - NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; + NIX_CFLAGS_LINK = + stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed " + + "-ldbus-1"; meta.platforms = stdenv.lib.platforms.all; }; @@ -98,7 +100,9 @@ in rec { tests = dbus_drv "tests" "test" { preBuild = makeInternalLib; buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs tools daemon dbus_glib python ]; - NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; + NIX_CFLAGS_LINK = + stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed " + + "-ldbus-1"; }; docs = dbus_drv "docs" "doc" {