diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-23 02:55:26 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-23 02:55:42 +0200 |
commit | b8ba71d6333cdb38220aa0ea6150c7f393de0898 (patch) | |
tree | 8f8d594e694894346ee6162f756613506f327e74 | |
parent | 4919db9cbb999ca45153ebd4cba094693b518586 (diff) | |
download | nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.tar nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.tar.gz nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.tar.bz2 nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.tar.lz nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.tar.xz nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.tar.zst nixpkgs-b8ba71d6333cdb38220aa0ea6150c7f393de0898.zip |
tracker-miners: move from gnome3
-rw-r--r-- | nixos/modules/services/desktops/gnome3/tracker-miners.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/tracker-miners/default.nix (renamed from pkgs/desktops/gnome-3/core/tracker-miners/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/tracker-miners/fix-paths.patch (renamed from pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 6 insertions, 6 deletions
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/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/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 9f31e70ad53..9f31e70ad53 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch index 724c51cb56f..724c51cb56f 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch 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 { }; |