JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19133 from groxxda/gtkvnc

Browse Source 
gtk-vnc: remove gtk2 support, 0.5.3 -> 0.6.0
This commit is contained in:
Jörg Thalheim 2016-10-03 16:19:11 +02:00 committed by GitHub
commit f3ed2b60a6
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.20/default.nix
View File

@ -46,7 +46,7 @@ let
]; ];
inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 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; inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -54,7 +54,6 @@ let
gnome3 = self // { recurseForDerivations = false; }; gnome3 = self // { recurseForDerivations = false; };
gtk = gtk3; gtk = gtk3;
gtkmm = gtkmm3; gtkmm = gtkmm3;
gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
vala = pkgs.vala_0_32; vala = pkgs.vala_0_32;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
webkitgtk = webkitgtk212x; webkitgtk = webkitgtk212x;
@ -268,7 +267,6 @@ let
glade = callPackage ./apps/glade { }; glade = callPackage ./apps/glade { };
gnome-boxes = callPackage ./apps/gnome-boxes { gnome-boxes = callPackage ./apps/gnome-boxes {
gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
spice_gtk = pkgs.spice_gtk; spice_gtk = pkgs.spice_gtk;
}; };

20
pkgs/tools/admin/gtk-vnc/default.nix
View File

@ -1,36 +1,32 @@
{ stdenv, fetchurl, gobjectIntrospection { stdenv, fetchurl, gobjectIntrospection
, gtk2, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , gnutls, cairo, libtool, glib, pkgconfig, libtasn1
, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_23 , kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32
, libogg, enableGTK3 ? false, libgpgerror, pythonPackages }: , libogg, libgpgerror, pythonPackages }:
let let
inherit (pythonPackages) pygobject3 pygobject2 pygtk python; inherit (pythonPackages) pygobject3 python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "gtk-vnc-${version}"; name = "gtk-vnc-${version}";
version = "0.5.3"; version = "0.6.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz"; url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz";
sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l"; sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433";
}; };
buildInputs = [ buildInputs = [
python gnutls cairo libtool pkgconfig glib libffi libgcrypt python gnutls cairo libtool pkgconfig glib libffi libgcrypt
intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
gobjectIntrospection libogg libgpgerror gobjectIntrospection libogg libgpgerror
] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk2 pygtk pygobject2 ]); gtk3 vala_0_32 pygobject3 ];
NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_CFLAGS_COMPILE = "-fstack-protector-all";
configureFlags = [ configureFlags = [
"--with-python" "--with-python"
"--with-examples" "--with-examples"
(if enableGTK3 then "--with-gtk=3.0" else "--with-gtk=2.0")
]; ];
makeFlags = stdenv.lib.optionalString (!enableGTK3)
"CODEGENDIR=${pygobject2}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
# Fix broken .la files # Fix broken .la files
preFixup = '' preFixup = ''
sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la

2
pkgs/top-level/all-packages.nix
View File

@ -14712,7 +14712,6 @@ in
}; };
virt-viewer = callPackage ../applications/virtualization/virt-viewer { virt-viewer = callPackage ../applications/virtualization/virt-viewer {
gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk; spice_gtk = spice_gtk;
}; };
@ -14720,7 +14719,6 @@ in
inherit (gnome2) gnome_python; inherit (gnome2) gnome_python;
vte = gnome3.vte; vte = gnome3.vte;
dconf = gnome3.dconf; dconf = gnome3.dconf;
gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk; spice_gtk = spice_gtk;
system-libvirt = libvirt; system-libvirt = libvirt;
}; };