gnome3.tracker: 2.1.6 -> 2.2.1
- move patch to file - turn on docs (they're turned off by default now)
This commit is contained in:
parent
43c905acd1
commit
fb5b2ad53f
@ -1,11 +1,12 @@
|
||||
{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2
|
||||
{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python3
|
||||
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
|
||||
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
|
||||
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
|
||||
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib
|
||||
, substituteAll}:
|
||||
|
||||
let
|
||||
pname = "tracker";
|
||||
version = "2.1.6";
|
||||
version = "2.2.1";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -13,13 +14,13 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq";
|
||||
sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection
|
||||
gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
|
||||
python2 # for data-generators
|
||||
python3 # for data-generators
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -33,27 +34,19 @@ in stdenv.mkDerivation rec {
|
||||
"-Dsystemd_user_services=lib/systemd/user"
|
||||
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
|
||||
"-Dfunctional_tests=false"
|
||||
"-Ddocs=true"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Always generate tracker-sparql.h in time
|
||||
(fetchurl {
|
||||
url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff;
|
||||
sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws";
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
glib_dev = glib.dev;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs utils/g-ir-merge/g-ir-merge
|
||||
patchShebangs utils/data-generators/cc/generate
|
||||
|
||||
# make .desktop Exec absolute
|
||||
patch -p0 <<END_PATCH
|
||||
+++ src/tracker-store/tracker-store.desktop.in.in
|
||||
@@ -4 +4 @@
|
||||
-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
|
||||
END_PATCH
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
12
pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
Normal file
12
pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- a/src/tracker-store/tracker-store.desktop.in
|
||||
+++ b/src/tracker-store/tracker-store.desktop.in
|
||||
@@ -1,8 +1,8 @@
|
||||
[Desktop Entry]
|
||||
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
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Utility;
|
||||
X-GNOME-Autostart-enabled=true
|
Loading…
Reference in New Issue
Block a user