JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracker: move from gnome3

Browse Source
This commit is contained in:
Jan Tojnar 2019-08-23 02:49:39 +02:00
parent 795e37b7fe
commit 4919db9cbb
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/desktops/gnome3/tracker.nix
View File

@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.tracker.enable { 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 ];
}; };

4
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View File

@ -2,7 +2,7 @@
, wrapGAppsHook, itstool, desktop-file-utils, python3 , wrapGAppsHook, itstool, desktop-file-utils, python3
, glib, gtk3, evolution-data-server, gnome-online-accounts , glib, gtk3, evolution-data-server, gnome-online-accounts
, libuuid, webkitgtk, zeitgeist , libuuid, webkitgtk, zeitgeist
, gnome3, libxml2, gsettings-desktop-schemas }: , gnome3, libxml2, gsettings-desktop-schemas, tracker }:
let let
version = "3.32.2"; version = "3.32.2";
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib gtk3 libuuid webkitgtk gnome3.tracker glib gtk3 libuuid webkitgtk tracker
gnome-online-accounts zeitgeist gnome-online-accounts zeitgeist
gsettings-desktop-schemas gsettings-desktop-schemas
evolution-data-server evolution-data-server

2
pkgs/desktops/gnome-3/core/tracker-miners/default.nix
View File

@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit (gnome3) tracker; inherit tracker;
}) })
# https://bugzilla.gnome.org/show_bug.cgi?id=795576 # https://bugzilla.gnome.org/show_bug.cgi?id=795576
(fetchurl { (fetchurl {

4
pkgs/desktops/gnome-3/default.nix
View File

@ -190,8 +190,6 @@ lib.makeScope pkgs.newScope (self: with self; {
totem = callPackage ./core/totem { }; totem = callPackage ./core/totem { };
tracker = callPackage ./core/tracker { };
tracker-miners = callPackage ./core/tracker-miners { }; tracker-miners = callPackage ./core/tracker-miners { };
vino = callPackage ./core/vino { }; 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; 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) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19 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; defaultIconTheme = adwaita-icon-theme;
gtk = gtk3; gtk = gtk3;

0
pkgs/desktops/gnome-3/core/tracker/default.nix → pkgs/development/libraries/tracker/default.nix
View File

0
pkgs/desktops/gnome-3/core/tracker/fix-paths.patch → pkgs/development/libraries/tracker/fix-paths.patch
View File

2
pkgs/top-level/all-packages.nix
View File

@ -2778,6 +2778,8 @@ in
tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };
tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { };
tracker = callPackage ../development/libraries/tracker { };
tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; tridactyl-native = callPackage ../tools/networking/tridactyl-native { };
trompeloeil = callPackage ../development/libraries/trompeloeil { }; trompeloeil = callPackage ../development/libraries/trompeloeil { };