diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index c061f789049..2e829274226 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.tracker.enable { - environment.systemPackages = [ pkgs.gnome3.tracker ]; + environment.systemPackages = [ pkgs.tracker ]; - services.dbus.packages = [ pkgs.gnome3.tracker ]; + services.dbus.packages = [ pkgs.tracker ]; - systemd.packages = [ pkgs.gnome3.tracker ]; + systemd.packages = [ pkgs.tracker ]; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 9fb3ca99d09..4a34f12912f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, itstool, desktop-file-utils, python3 , glib, gtk3, evolution-data-server, gnome-online-accounts , libuuid, webkitgtk, zeitgeist -, gnome3, libxml2, gsettings-desktop-schemas }: +, gnome3, libxml2, gsettings-desktop-schemas, tracker }: let version = "3.32.2"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libuuid webkitgtk gnome3.tracker + glib gtk3 libuuid webkitgtk tracker gnome-online-accounts zeitgeist gsettings-desktop-schemas evolution-data-server diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index eaa3ab3c089..9f31e70ad53 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit (gnome3) tracker; + inherit tracker; }) # https://bugzilla.gnome.org/show_bug.cgi?id=795576 (fetchurl { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f9c9ab54e5e..8070ec15953 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 = callPackage ./core/tracker { }; - tracker-miners = callPackage ./core/tracker-miners { }; vino = callPackage ./core/vino { }; @@ -385,7 +383,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; # added 2019-08-23 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker; # added 2019-08-23 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/tracker/default.nix rename to pkgs/development/libraries/tracker/default.nix diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/tracker/fix-paths.patch rename to pkgs/development/libraries/tracker/fix-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52a6171e8fa..c7eb1d85ae6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2778,6 +2778,8 @@ in tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; + tracker = callPackage ../development/libraries/tracker { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; trompeloeil = callPackage ../development/libraries/trompeloeil { };