Merge #29392: gnome3: 3.24 -> 3.26

It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.

1 files changed, 7 insertions, 5 deletions

diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index e405d8edfbaf..e463fe0e03f0 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/core/caribou/default.nix
@@ -1,8 +1,10 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }:
+{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2
+, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook
+, wrapGAppsHook }:
 
 let
   majorVersion = "0.4";
+  pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
 in
 stdenv.mkDerivation rec {
   name = "caribou-${majorVersion}.21";
@@ -12,11 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ];
 
   buildInputs = with gnome3;
-    [ glib gtk clutter at_spi2_core dbus pythonPackages.python
-      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
+    [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3
+      libXtst gtk2 ];
 
   propagatedBuildInputs = [ gnome3.libgee libxklavier ];