From c2800a26b44bd1d37e950c0fdb77878559444c0c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 7 May 2019 01:25:40 +0200 Subject: [PATCH] dbus-glib: fix cross --- pkgs/development/libraries/dbus-glib/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index fe57759f09f..c6237795960 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: +{ stdenv, fetchurl, buildPackages +, pkgconfig, expat, gettext, libiconv, dbus, glib +}: stdenv.mkDerivation rec { name = "dbus-glib-0.110"; @@ -11,15 +13,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext glib ]; buildInputs = [ expat libiconv ]; propagatedBuildInputs = [ dbus glib ]; - preConfigure = '' - configureFlagsArray+=("--exec-prefix=$dev") - ''; + configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++ + stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool"; doCheck = false;