diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/tracker/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/tracker/default.nix | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index fb111829c7e1..e37db9f25330 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,19 +1,19 @@ { stdenv , fetchurl +, fetchpatch , gettext , meson , ninja , pkgconfig +, asciidoc , gobject-introspection , python3 , gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, docbook_xml_dtd_43 +, docbook-xsl-nons , docbook_xml_dtd_45 , libxml2 , glib -, wrapGAppsHook +, wrapGAppsNoGuiHook , vala , sqlite , libxslt @@ -21,7 +21,6 @@ , gnome3 , icu , libuuid -, networkmanager , libsoup , json-glib , systemd @@ -31,19 +30,26 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "2.3.4"; + version = "3.0.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"; + sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; }; patches = [ (substituteAll { src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; + inherit asciidoc; + }) + + # Fix consistency error with sqlite 3.34 + # https://gitlab.gnome.org/GNOME/tracker/merge_requests/353 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch"; + sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs="; }) ]; @@ -52,14 +58,13 @@ stdenv.mkDerivation rec { ninja vala pkgconfig + asciidoc gettext libxslt - wrapGAppsHook + wrapGAppsNoGuiHook gobject-introspection gtk-doc - docbook_xsl - docbook_xml_dtd_412 - docbook_xml_dtd_43 + docbook-xsl-nons docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service @@ -71,7 +76,6 @@ stdenv.mkDerivation rec { libxml2 sqlite icu - networkmanager libsoup libuuid json-glib @@ -83,8 +87,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - # "-Dfunctional_tests=true" "-Ddocs=true" ]; @@ -106,9 +108,17 @@ stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 - ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 - ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so + ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0 + ''; + + checkPhase = '' + runHook preCheck + + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + + runHook postCheck ''; postCheck = '' @@ -116,10 +126,6 @@ stdenv.mkDerivation rec { rm -r $out/lib ''; - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; |