From d6c8771dd44b6617a4047f86166860b6c6762ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:10:34 +0100 Subject: [PATCH] gnome3.tracker-miners: 2.1.5 -> 2.2.1 - update patch: meson.build now get stuff correctly from pkgconfig --- .../gnome-3/core/tracker-miners/default.nix | 4 ++-- .../core/tracker-miners/fix-paths.patch | 22 ------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 85bb32972f4..1f5e2fcca5c 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -8,11 +8,11 @@ let pname = "tracker-miners"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.1.5"; + version = "2.2.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm"; + sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr"; }; nativeBuildInputs = [ 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 47ad114eb0b..724c51cb56f 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,25 +1,3 @@ ---- a/meson.build -+++ b/meson.build -@@ -25,15 +25,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') - else - tracker_subproject = subproject('tracker', - default_options: [ --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c @@ -323,7 +323,7 @@