From b8ba71d6333cdb38220aa0ea6150c7f393de0898 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Aug 2019 02:55:26 +0200 Subject: tracker-miners: move from gnome3 --- .../services/desktops/gnome3/tracker-miners.nix | 6 +- .../gnome-3/core/tracker-miners/default.nix | 140 --------------------- .../gnome-3/core/tracker-miners/fix-paths.patch | 20 --- pkgs/desktops/gnome-3/default.nix | 4 +- .../libraries/tracker-miners/default.nix | 140 +++++++++++++++++++++ .../libraries/tracker-miners/fix-paths.patch | 20 +++ pkgs/top-level/all-packages.nix | 2 + 7 files changed, 166 insertions(+), 166 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/tracker-miners/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch create mode 100644 pkgs/development/libraries/tracker-miners/default.nix create mode 100644 pkgs/development/libraries/tracker-miners/fix-paths.patch diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix index 20154fc2fed..b390d8368c6 100644 --- a/nixos/modules/services/desktops/gnome3/tracker-miners.nix +++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.tracker-miners.enable { - environment.systemPackages = [ pkgs.gnome3.tracker-miners ]; + environment.systemPackages = [ pkgs.tracker-miners ]; - services.dbus.packages = [ pkgs.gnome3.tracker-miners ]; + services.dbus.packages = [ pkgs.tracker-miners ]; - systemd.packages = [ pkgs.gnome3.tracker-miners ]; + systemd.packages = [ pkgs.tracker-miners ]; }; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix deleted file mode 100644 index 9f31e70ad53..00000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ stdenv -, fetchurl -, substituteAll -, intltool -, itstool -, libxslt -, gexiv2 -, tracker -, meson -, ninja -, pkgconfig -, vala -, wrapGAppsHook -, bzip2 -, dbus -, evolution-data-server -, exempi -, flac -, giflib -, glib -, gnome3 -, gst_all_1 -, icu -, json-glib -, libcue -, libexif -, libgrss -, libgsf -, libgxps -, libiptcdata -, libjpeg -, libosinfo -, libpng -, libseccomp -, libsoup -, libtiff -, libuuid -, libvorbis -, libxml2 -, poppler -, taglib -, upower -, totem-pl-parser -}: - -stdenv.mkDerivation rec { - pname = "tracker-miners"; - version = "2.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw"; - }; - - nativeBuildInputs = [ - intltool - itstool - libxslt - meson - ninja - pkgconfig - vala - wrapGAppsHook - ]; - - # TODO: add libenca, libosinfo - buildInputs = [ - bzip2 - dbus - evolution-data-server - exempi - flac - giflib - glib - gexiv2 - totem-pl-parser - tracker - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - icu - json-glib - libcue - libexif - libgrss - libgsf - libgxps - libiptcdata - libjpeg - libosinfo - libpng - libseccomp - libsoup - libtiff - libuuid - libvorbis - libxml2 - poppler - taglib - upower - ]; - - mesonFlags = [ - # TODO: tests do not like our sandbox - "-Dfunctional_tests=false" - "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit tracker; - }) - # https://bugzilla.gnome.org/show_bug.cgi?id=795576 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371427; - sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; - }) - ]; - - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch deleted file mode 100644 index 724c51cb56f..00000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/libtracker-miners-common/tracker-domain-ontology.c -+++ b/src/libtracker-miners-common/tracker-domain-ontology.c -@@ -323,7 +323,7 @@ - goto end; - } - } else { -- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", -+ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", - DEFAULT_RULE, NULL); - - if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { -@@ -388,7 +388,7 @@ - if (!priv->ontology_location) { - gchar *ontology_path; - -- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies", -+ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies", - priv->ontology_name, NULL); - - if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 8070ec15953..4f78efc8bc2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -190,8 +190,6 @@ lib.makeScope pkgs.newScope (self: with self; { totem = callPackage ./core/totem { }; - tracker-miners = callPackage ./core/tracker-miners { }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; @@ -383,7 +381,7 @@ lib.makeScope pkgs.newScope (self: with self; { clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 - inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker; # added 2019-08-23 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners; # added 2019-08-23 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix new file mode 100644 index 00000000000..9f31e70ad53 --- /dev/null +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -0,0 +1,140 @@ +{ stdenv +, fetchurl +, substituteAll +, intltool +, itstool +, libxslt +, gexiv2 +, tracker +, meson +, ninja +, pkgconfig +, vala +, wrapGAppsHook +, bzip2 +, dbus +, evolution-data-server +, exempi +, flac +, giflib +, glib +, gnome3 +, gst_all_1 +, icu +, json-glib +, libcue +, libexif +, libgrss +, libgsf +, libgxps +, libiptcdata +, libjpeg +, libosinfo +, libpng +, libseccomp +, libsoup +, libtiff +, libuuid +, libvorbis +, libxml2 +, poppler +, taglib +, upower +, totem-pl-parser +}: + +stdenv.mkDerivation rec { + pname = "tracker-miners"; + version = "2.2.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw"; + }; + + nativeBuildInputs = [ + intltool + itstool + libxslt + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + # TODO: add libenca, libosinfo + buildInputs = [ + bzip2 + dbus + evolution-data-server + exempi + flac + giflib + glib + gexiv2 + totem-pl-parser + tracker + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + icu + json-glib + libcue + libexif + libgrss + libgsf + libgxps + libiptcdata + libjpeg + libosinfo + libpng + libseccomp + libsoup + libtiff + libuuid + libvorbis + libxml2 + poppler + taglib + upower + ]; + + mesonFlags = [ + # TODO: tests do not like our sandbox + "-Dfunctional_tests=false" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tracker; + }) + # https://bugzilla.gnome.org/show_bug.cgi?id=795576 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=371427; + sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; + }) + ]; + + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tracker; + description = "Desktop-neutral user information store, search tool and indexer"; + maintainers = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch new file mode 100644 index 00000000000..724c51cb56f --- /dev/null +++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/libtracker-miners-common/tracker-domain-ontology.c ++++ b/src/libtracker-miners-common/tracker-domain-ontology.c +@@ -323,7 +323,7 @@ + goto end; + } + } else { +- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", ++ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", + DEFAULT_RULE, NULL); + + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { +@@ -388,7 +388,7 @@ + if (!priv->ontology_location) { + gchar *ontology_path; + +- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies", ++ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies", + priv->ontology_name, NULL); + + if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7eb1d85ae6..b5052ed872b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2780,6 +2780,8 @@ in tracker = callPackage ../development/libraries/tracker { }; + tracker-miners = callPackage ../development/libraries/tracker-miners { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; -- cgit 1.4.1