summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/desktops/gnome-3/default.nix4
-rw-r--r--pkgs/development/libraries/grilo/default.nix (renamed from pkgs/desktops/gnome-3/core/grilo/default.nix)1
-rw-r--r--pkgs/development/libraries/grilo/setup-hook.sh (renamed from pkgs/desktops/gnome-3/core/grilo/setup-hook.sh)0
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 3a81bc523b9..326dbb81aca 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
index 33293f0b3cb..b2a7f0bd5ae 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
index 9337c520a20..9337c520a20 100644
--- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
+++ b/pkgs/development/libraries/grilo/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de7f3a5c9f3..7e3706870e3 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 { };