public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59627 from worldofpeace/tracker-correct

Browse Source 
gnome3.tracker: correct gdbus path
This commit is contained in:
worldofpeace 2019-04-15 15:15:45 -04:00 committed by GitHub
commit 9e3d9e2379
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/gnome-3/core/tracker/default.nix
View File

@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
mesonFlags = [ mesonFlags = [
"-Ddbus_services=share/dbus-1/services" "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services"
"-Dsystemd_user_services=lib/systemd/user" "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user"
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
"-Dfunctional_tests=false" "-Dfunctional_tests=false"
"-Ddocs=true" "-Ddocs=true"
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
glib_dev = glib.dev; gdbus = "${glib.bin}/bin/gdbus";
}) })
]; ];

2
pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
View File

@ -5,7 +5,7 @@
Name=Tracker Store Name=Tracker Store
Comment=Metadata database store and lookup manager Comment=Metadata database store and lookup manager
-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 -Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
+Exec=@glib_dev@/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 +Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Utility; Categories=Utility;