public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbus_tools: fix build on darwin (close #929)

Browse Source
This commit is contained in:
Jason \"Don\" O'Conal 2013-09-07 07:36:30 +10:00 committed by Vladimír Čunát
parent 834cd6c886
commit ac39ba7953
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/dbus/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
, expat, systemd, glib, dbus_glib, python , expat, systemd, glib, dbus_glib, python
, libX11, libICE, libSM, useX11 ? stdenv.isLinux }: , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
let let
version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8 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" { tools = dbus_drv "tools" "tools" {
configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ];
buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ]; 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; meta.platforms = stdenv.lib.platforms.all;
}; };
@ -98,7 +100,9 @@ in rec {
tests = dbus_drv "tests" "test" { tests = dbus_drv "tests" "test" {
preBuild = makeInternalLib; preBuild = makeInternalLib;
buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs tools daemon dbus_glib python ]; 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" { docs = dbus_drv "docs" "doc" {