From a2ba083f1802bb05541bed5c6feb1c0da1956ad6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Aug 2019 02:35:56 +0200
Subject: [PATCH] grilo: move from gnome3
---
pkgs/desktops/gnome-3/default.nix | 4 +---
.../gnome-3/core => development/libraries}/grilo/default.nix | 1 -
.../core => development/libraries}/grilo/setup-hook.sh | 0
pkgs/top-level/all-packages.nix | 2 ++
4 files changed, 3 insertions(+), 4 deletions(-)
rename pkgs/{desktops/gnome-3/core => development/libraries}/grilo/default.nix (98%)
rename pkgs/{desktops/gnome-3/core => development/libraries}/grilo/setup-hook.sh (100%)
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 3a81bc523b94..326dbb81aca4 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 = callPackage ./core/grilo { };
-
grilo-plugins = callPackage ./core/grilo-plugins { };
gucharmap = callPackage ./core/gucharmap { };
@@ -389,7 +387,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; # added 2019-08-23
+ inherit (pkgs) gnome-online-accounts grilo; # added 2019-08-23
defaultIconTheme = adwaita-icon-theme;
gtk = gtk3;
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
similarity index 98%
rename from pkgs/desktops/gnome-3/core/grilo/default.nix
rename to pkgs/development/libraries/grilo/default.nix
index 33293f0b3cbd..b2a7f0bd5aef 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -48,7 +48,6 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
- attrPath = "gnome3.${pname}";
versionPolicy = "none";
};
};
diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/development/libraries/grilo/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
rename to pkgs/development/libraries/grilo/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de7f3a5c9f34..7e3706870e3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10954,6 +10954,8 @@ in
grib-api = callPackage ../development/libraries/grib-api { };
+ grilo = callPackage ../development/libraries/grilo { };
+
grpc = callPackage ../development/libraries/grpc { };
gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };