summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@higgsboson.tk>2016-10-03 16:19:11 +0200
committerGitHub <noreply@github.com>2016-10-03 16:19:11 +0200
commitf3ed2b60a63253c0d92381dbd6dd7e982a17c6ab (patch)
treea859b551b5812f5a23115ff0b35d3bfb1c36f8f7 /pkgs/desktops/gnome-3
parent4c39fe5d6631bcb98526e440ddc66f7c13b8f256 (diff)
parentda658b98ce3454c98ad6e1429c2e78eac07d0a6a (diff)
downloadnixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.tar
nixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.tar.gz
nixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.tar.bz2
nixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.tar.lz
nixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.tar.xz
nixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.tar.zst
nixlib-f3ed2b60a63253c0d92381dbd6dd7e982a17c6ab.zip
Merge pull request #19133 from groxxda/gtkvnc
gtk-vnc: remove gtk2 support, 0.5.3 -> 0.6.0
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/3.20/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix
index b6ed62a29c81..e935552b9f5f 100644
--- a/pkgs/desktops/gnome-3/3.20/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/default.nix
@@ -46,7 +46,7 @@ let
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2
-    clutter clutter-gst clutter_gtk cogl;
+    clutter clutter-gst clutter_gtk cogl gtkvnc;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -54,7 +54,6 @@ let
   gnome3 = self // { recurseForDerivations = false; };
   gtk = gtk3;
   gtkmm = gtkmm3;
-  gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
   vala = pkgs.vala_0_32;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
   webkitgtk = webkitgtk212x;
@@ -268,7 +267,6 @@ let
   glade = callPackage ./apps/glade { };
 
   gnome-boxes = callPackage ./apps/gnome-boxes {
-    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
     spice_gtk = pkgs.spice_gtk;
   };