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; }; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 5d3053b2a3e3..3b7390b73be1 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gobjectIntrospection -, gtk2, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio , kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_23 -, libogg, enableGTK3 ? false, libgpgerror, pythonPackages }: +, libogg, libgpgerror, pythonPackages }: let - inherit (pythonPackages) pygobject3 pygobject2 pygtk python; + inherit (pythonPackages) pygobject3 python; in stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; version = "0.5.3"; @@ -19,18 +19,15 @@ in stdenv.mkDerivation rec { python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror - ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk2 pygtk pygobject2 ]); + gtk3 vala_0_23 pygobject3 ]; NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ "--with-python" "--with-examples" - (if enableGTK3 then "--with-gtk=3.0" else "--with-gtk=2.0") + "--with-gtk=3.0" ]; - makeFlags = stdenv.lib.optionalString (!enableGTK3) - "CODEGENDIR=${pygobject2}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; - # Fix broken .la files preFixup = '' sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d3648e49eb3..4eb1e2b2fa1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14680,7 +14680,6 @@ in }; virt-viewer = callPackage ../applications/virtualization/virt-viewer { - gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk; }; @@ -14688,7 +14687,6 @@ in inherit (gnome2) gnome_python; vte = gnome3.vte; dconf = gnome3.dconf; - gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk; system-libvirt = libvirt; };