diff options
| author | Alexander Ried <ried@mytum.de> | 2016-10-01 11:19:20 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-10-15 20:32:12 +0200 |
| commit | 76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b (patch) | |
| tree | ff9089bf5bf28c7acc815ceafaa780c6d34fe3f7 /pkgs/desktops/gnome-3 | |
| parent | e8ade4ff789d66245255c6951b8f2674c537d929 (diff) | |
| download | nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.tar nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.tar.gz nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.tar.bz2 nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.tar.lz nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.tar.xz nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.tar.zst nixlib-76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b.zip | |
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.
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix | 6 |
1 files 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 |