diff options
| author | Robin Gloster <mail@glob.in> | 2019-05-07 01:25:40 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-05-07 18:14:11 +0200 |
| commit | c2800a26b44bd1d37e950c0fdb77878559444c0c (patch) | |
| tree | 6404a10618ace084eb6eae9133e1bb3ff9770188 | |
| parent | abb10fe7aed454e2fde6ab1bcb11107b736fd5d4 (diff) | |
| download | nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.tar nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.tar.gz nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.tar.bz2 nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.tar.lz nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.tar.xz nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.tar.zst nixpkgs-c2800a26b44bd1d37e950c0fdb77878559444c0c.zip | |
dbus-glib: fix cross
| -rw-r--r-- | pkgs/development/libraries/dbus-glib/default.nix | 12 |
1 files 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; |