From 76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 11:19:20 +0200 Subject: [PATCH] gnome3_22.gnome-terminal: substitute gnome-shell dbus file path instead of copying the file. this avoids name conflicts after the build. Alternatively we could remove the file after building. --- pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix index beb019947ce2..6bf920b3e1c7 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { # 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" + postPatch = '' + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; # FIXME: enable for gnome3