From ca717d0d654c11cc59622123251e79bb9ec7142d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> Date: Mon, 4 Jan 2016 15:50:46 +0100 Subject: [PATCH] gnome-terminal: enable GNOME Shell search provider (for 3.18) [This is a re-application of the patch that was originally written for GNOME 3.16. It was lost during the transition to GNOME 3.18.] 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). --- .../gnome-3/3.18/core/gnome-terminal/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix index 052a16affdc0..c523d732e03a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils wrapGAppsHook ]; + # 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" ]; meta = with stdenv.lib; { description = "The GNOME Terminal Emulator";