diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-01-04 15:50:46 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-01-10 22:27:24 +0100 |
commit | 3d81213509e1933f03f3ad85b17e568ecc23bfd5 (patch) | |
tree | 17a501f35a3eb09fb992dcbccb9e00e8132bc8be | |
parent | 01eea878adb67584b260b23e7106f05ba780aef7 (diff) | |
download | nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.tar nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.tar.gz nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.tar.bz2 nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.tar.lz nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.tar.xz nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.tar.zst nixpkgs-3d81213509e1933f03f3ad85b17e568ecc23bfd5.zip |
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).
-rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
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 |