From 075e4883e0abea400aecb886e6244a6c2acf7bd8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 29 Oct 2018 10:15:19 -0500 Subject: [PATCH] ibus: fix cross compilation gtk-doc is a native input so we need to use buildPackages here. --- pkgs/tools/inputmethods/ibus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 540779477e3..3b6f3c989a3 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true -, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: +, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null +, buildPackages }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh - cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . + cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog";