From 87081caaf94b234e02a6c425ee077cac077af502 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 24 Sep 2016 07:44:59 -0400 Subject: [PATCH 1/3] spice-gtk: 0.29 -> 0.32 Signed-off-by: Alexander Ried --- pkgs/desktops/gnome-3/3.22/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 926694f48d40..6c0c52e24641 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -262,9 +262,7 @@ let glade = callPackage ./apps/glade { }; - gnome-boxes = callPackage ./apps/gnome-boxes { - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; - }; + gnome-boxes = callPackage ./apps/gnome-boxes { }; gnome-calendar = callPackage ./apps/gnome-calendar { }; From 53b13ef6039a437369e9029513d94774ec85ddba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Oct 2016 17:42:24 +0200 Subject: [PATCH 2/3] gnome3.anjuta: fix a gschemas crash Signed-off-by: Alexander Ried --- pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix index af74df4ad13b..3cb62fef6c2f 100644 --- a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; + gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper + gnome3.gsettings_desktop_schemas + ]; preFixup = '' wrapProgram $out/bin/anjuta \ From 7902a5de5977747563b1766a0d0d1d8a6ab53fe4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 10 Oct 2016 21:12:34 +0200 Subject: [PATCH 3/3] epiphany: fix tls support without gnome3.glib_networking, epiphany does not support TLS or SSL Signed-off-by: Alexander Ried --- pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix index e38d075befcf..9d36648d5cdc 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; + gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf + gnome3.glib_networking ]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";