diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-09-13 12:51:34 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-09-13 12:51:34 +0300 |
commit | 47487099263220f788dcbde58848b9a06801bc86 (patch) | |
tree | 4d25739ec07de84e0096b9980f7bbad20dbb43a1 /pkgs/applications/networking/remote | |
parent | 9c47876b84e5ec1701478afc90f48326d71aa803 (diff) | |
parent | a769e0ffae239e62f368f5a21c3e00a849dd5531 (diff) | |
download | nixlib-47487099263220f788dcbde58848b9a06801bc86.tar nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.gz nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.bz2 nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.lz nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.xz nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.zst nixlib-47487099263220f788dcbde58848b9a06801bc86.zip |
Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/applications/networking/remote')
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 4f64e947f09e..f8ec7ec01d91 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -8,7 +8,7 @@ , tzdata , cacert , glib -, gtk +, gtk2 , atk , gdk_pixbuf , cairo @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { makeWrapper busybox file - gtk + gtk2 gdk_pixbuf ]; libPath = stdenv.lib.makeLibraryPath [ glib - gtk + gtk2 atk gdk_pixbuf cairo @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 05019f833538..503632c009b0 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: +{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }: stdenv.mkDerivation rec { version = "0.67"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd unix ''; - buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ]; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6257c5f95ebc..9bc389961079 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, makeWrapper -, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk2, gettext, libxkbfile, libgnome_keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: let @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; buildInputs = [ cmake pkgconfig makeWrapper - glib gtk gettext libxkbfile libgnome_keyring libX11 + glib gtk2 gettext libxkbfile libgnome_keyring libX11 freerdp libssh libgcrypt gnutls ]; cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; |