diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-06-07 14:30:00 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-06-18 14:17:27 +0200 |
| commit | 0b061e7f753534a627ee6eb5adc8c6f48b531031 (patch) | |
| tree | 4928403ee6ed21f2649b7fbab92ea2f6d390acfb /pkgs/desktops | |
| parent | bb084880effdd89ea132deb91626d56fe51dcf01 (diff) | |
| download | nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.tar nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.tar.gz nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.tar.bz2 nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.tar.lz nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.tar.xz nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.tar.zst nixlib-0b061e7f753534a627ee6eb5adc8c6f48b531031.zip | |
gnome-terminal: enable GNOME Shell search provider (for 3.20)
[This is a re-re-application of the patch that was originally written for GNOME 3.16. It was lost during the transition to GNOME 3.18 and then to 3.20. Third time's a charm?] Silly ./configure, it looks for dbus file from gnome-shell in the installation tree of the package it is configuring. Fix by copying needed file from gnome-shell before ./configure is run. This change makes gnome-shell a build time dependency (not runtime).
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix index 052a16affdc0..c523d732e03a 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.20/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"; |