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

gnome3.tracker: 2.1.6 -> 2.2.1

Browse Source 
- move patch to file
- turn on docs (they're turned off by default now)
This commit is contained in:
Tor Hedin Brønner 2019-03-03 19:08:17 +01:00 committed by Jan Tojnar
parent 43c905acd1
commit fb5b2ad53f
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: , gnome3, icu, libuuid, networkmanager, libsoup, json-glib
, substituteAll}:
let let
pname = "tracker"; pname = "tracker";
version = "2.1.6"; version = "2.2.1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -13,13 +14,13 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq"; sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection
gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
python2 # for data-generators python3 # for data-generators
]; ];
buildInputs = [ buildInputs = [
@ -33,27 +34,19 @@ in stdenv.mkDerivation rec {
"-Dsystemd_user_services=lib/systemd/user" "-Dsystemd_user_services=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"
]; ];
patches = [ patches = [
# Always generate tracker-sparql.h in time (substituteAll {
(fetchurl { src = ./fix-paths.patch;
url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff; glib_dev = glib.dev;
sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws";
}) })
]; ];
postPatch = '' postPatch = ''
patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/g-ir-merge/g-ir-merge
patchShebangs utils/data-generators/cc/generate 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 = '' postInstall = ''

12
pkgs/desktops/gnome-3/core/tracker/fix-paths.patch Normal file
View 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