grilo-plugins: move from gnome3

2 files changed, 1 insertions, 85 deletions

diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
deleted file mode 100644
index 118a910a1683..000000000000
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv
-, fetchurl
-, meson
-, ninja
-, pkgconfig
-, gettext
-, gperf
-, sqlite
-, librest
-, libarchive
-, libsoup
-, gnome3
-, libxml2
-, lua5_3
-, liboauth
-, libgdata
-, libmediaart
-, grilo
-, gnome-online-accounts
-, gmime
-, json-glib
-, avahi
-, tracker
-, dleyna-server
-, itstool
-, totem-pl-parser
-}:
-
-stdenv.mkDerivation rec {
-  pname = "grilo-plugins";
-  version = "0.3.9";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkgconfig
-    gettext
-    itstool
-    gperf # for lua-factory
-  ];
-
-  buildInputs = [
-    grilo
-    libxml2
-    libgdata
-    lua5_3
-    liboauth
-    sqlite
-    gnome-online-accounts
-    totem-pl-parser
-    librest
-    libarchive
-    libsoup
-    gmime
-    json-glib
-    avahi
-    libmediaart
-    tracker
-    dleyna-server
-  ];
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      attrPath = "gnome3.${pname}";
-      versionPolicy = "none";
-    };
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/Grilo;
-    description = "A collection of plugins for the Grilo framework";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 326dbb81aca4..f9c9ab54e5ed 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;