diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 4b450c174772..36199c3818c4 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=share/dbus-1/services" - "-Dsystemd_user_services=lib/systemd/user" + "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" "-Ddocs=true" @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - glib_dev = glib.dev; + gdbus = "${glib.bin}/bin/gdbus"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch index 2108afcab337..f5c13c3fcdaf 100644 --- a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch @@ -5,7 +5,7 @@ Name=Tracker Store 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=@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 Type=Application Categories=Utility;