From 795e37b7fe349f2c4d2e44f59d3e015089f01af6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Aug 2019 02:37:54 +0200 Subject: [PATCH] grilo-plugins: move from gnome3 --- pkgs/desktops/gnome-3/default.nix | 4 +--- .../core => development/libraries}/grilo-plugins/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{desktops/gnome-3/core => development/libraries}/grilo-plugins/default.nix (100%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 326dbb81aca..f9c9ab54e5e 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -139,8 +139,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-user-share = callPackage ./core/gnome-user-share { }; - grilo-plugins = callPackage ./core/grilo-plugins { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; @@ -387,7 +385,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; # added 2019-08-23 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins; # added 2019-08-23 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/grilo-plugins/default.nix rename to pkgs/development/libraries/grilo-plugins/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e3706870e3..52a6171e8fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,6 +10956,8 @@ in grilo = callPackage ../development/libraries/grilo { }; + grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; + grpc = callPackage ../development/libraries/grpc { }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };