diff options
| author | Alexander Ried <ried@mytum.de> | 2016-10-01 13:31:10 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-10-01 17:14:31 +0200 |
| commit | ecd80b9a0e8154b10c3a1f66761aa78aefbd8895 (patch) | |
| tree | e2bdc534248bdf05d282596bf8eee6ef39d2f2fc /pkgs/tools/admin | |
| parent | d9c6879ae277c5474987b01e655329f25ef16b33 (diff) | |
| download | nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.tar nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.tar.gz nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.tar.bz2 nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.tar.lz nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.tar.xz nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.tar.zst nixlib-ecd80b9a0e8154b10c3a1f66761aa78aefbd8895.zip | |
gtk-vnc: remove gtk2 support (unused)
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
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 |