diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-18 15:55:14 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-25 15:57:23 +0200 |
commit | 21e9b859287aed48e62382ed35163f6aa73ee607 (patch) | |
tree | e4128d643a502f4b2d6917373783983bebd49ae2 /pkgs/desktops/gnome-3 | |
parent | c219d313ddcf5eb93654e4d1c02e1946ec9da4c0 (diff) | |
download | nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.tar nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.tar.gz nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.tar.bz2 nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.tar.lz nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.tar.xz nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.tar.zst nixlib-21e9b859287aed48e62382ed35163f6aa73ee607.zip |
gnome3.tracker-miners: 2.0.5 → 2.1.1
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/core/tracker-miners/default.nix | 39 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch | 24 |
2 files changed, 42 insertions, 21 deletions
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index dc55fa9a7b4a..67c43311123c 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif -, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid +, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid , libvorbis, libxml2, poppler, taglib, upower }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "tracker-miners"; - version = "2.0.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "2.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4"; + sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0"; }; nativeBuildInputs = [ intltool itstool libxslt - makeWrapper meson ninja pkgconfig @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - # TODO: add libgrss, libenca, libosinfo + # TODO: add libenca, libosinfo buildInputs = [ bzip2 dbus @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { json-glib libcue libexif + libgrss libgsf libiptcdata libjpeg @@ -60,7 +61,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dminer_rss=false" # needs libgrss + # TODO: tests do not like our sandbox + "-Dfunctional_tests=false" ]; patches = [ @@ -75,13 +77,7 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - + # Symlinks require absolute path and we still cannot use placeholders # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131 # https://github.com/NixOS/nixpkgs/pull/37693 preConfigure = '' @@ -92,10 +88,13 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - # https://bugzilla.gnome.org/show_bug.cgi?id=796145 - postFixup = '' - rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 847e3bf204dd..74da929c5642 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,3 +1,25 @@ +--- a/meson.build ++++ b/meson.build +@@ -37,15 +37,15 @@ + # + # This check acts as a guard to make sure we are being configured with the + # right prefix, among other things. +- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store')) ++ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store')) + tracker_store_path = tracker_store.path() + + # If we are building against an installed version of tracker core rather than + # having it as a subproject, these 'uninstalled' locations point to the actual + # installed locations. +- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule') +- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk') +- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule') ++ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule') ++ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk') ++ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule') + endif + + avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c @@ -313,7 +313,7 @@ @@ -9,7 +31,7 @@ DEFAULT_RULE, NULL); if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { -@@ -372,7 +372,7 @@ +@@ -378,7 +378,7 @@ if (!priv->ontology_location) { gchar *ontology_path; |