From 53286a8886250ec1afce3364b44f048cd8e3cc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 4 Jan 2016 15:50:46 +0100 Subject: [PATCH] gnome-terminal: enable GNOME Shell search provider Silly ./configure, it looks for dbus file from gnome-shell in the installation tree of the package it is configuring. Fix by copying the needed file from gnome-shell before ./configure is run. This change makes gnome-shell a build time dependency (not runtime). (cherry picked from commit 3d81213509e1933f03f3ad85b17e568ecc23bfd5) --- .../gnome-3/3.16/core/gnome-terminal/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix index c7432a760cf..8be614f7397 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix @@ -19,8 +19,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; + # Silly ./configure, it looks for dbus file from gnome-shell in the + # installation tree of the package it is configuring. + preConfigure = '' + mkdir -p "$out/share/dbus-1/interfaces" + cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces" + ''; + # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--disable-migration" ]; + configureFlags = [ "--disable-migration" ]; preFixup = '' for f in "$out/libexec/gnome-terminal-server"; do