Merge branch 'master' into flip-map-foreach
This commit is contained in:
Danylo Hlynskyi
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, makeWrapper, makeDesktopItem
|
||||
, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
|
||||
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
|
||||
, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome }:
|
||||
|
||||
let
|
||||
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
atk cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
|
||||
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
|
||||
gnome2.gtkglext libGLU_combined freetype fontconfig
|
||||
pangox_compat polkit polkit_gnome
|
||||
] ++ (with xorg; [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
, glib
|
||||
, gtk2
|
||||
, atk
|
||||
, gdk_pixbuf
|
||||
, gdk-pixbuf
|
||||
, cairo
|
||||
, pango
|
||||
, gnome3
|
||||
@@ -100,14 +100,14 @@ let
|
||||
busybox
|
||||
file
|
||||
gtk2
|
||||
gdk_pixbuf
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
glib
|
||||
gtk2
|
||||
atk
|
||||
gdk_pixbuf
|
||||
gdk-pixbuf
|
||||
cairo
|
||||
pango
|
||||
gnome3.dconf
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
, glib
|
||||
, gtk2
|
||||
, atk
|
||||
, gdk_pixbuf
|
||||
, gdk-pixbuf
|
||||
, cairo
|
||||
, pango
|
||||
, gnome3
|
||||
@@ -22,22 +22,11 @@
|
||||
, fontconfig
|
||||
, gtk_engines
|
||||
, alsaLib
|
||||
, libidn
|
||||
, zlib
|
||||
, version ? "19.3.0"
|
||||
, version ? "19.6.0"
|
||||
}:
|
||||
|
||||
let
|
||||
# In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12.
|
||||
# Citrix looks for the former so we build version 1.34 to please the binary
|
||||
libidn_134 = libidn.overrideDerivation (_: rec {
|
||||
name = "libidn-1.34";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libidn/${name}.tar.gz";
|
||||
sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
|
||||
};
|
||||
});
|
||||
|
||||
versionInfo = let
|
||||
supportedVersions = {
|
||||
"19.3.0" = {
|
||||
@@ -48,13 +37,27 @@ let
|
||||
x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w";
|
||||
x64suffix = "5";
|
||||
x86suffix = "5";
|
||||
homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1903.html;
|
||||
};
|
||||
|
||||
"19.6.0" = {
|
||||
major = "19";
|
||||
minor = "6";
|
||||
patch = "0";
|
||||
x64hash = "0szqlfmigzgf0309i6ikxkizxaf4ri7qmhys75m0zi3bpwx6hzhs";
|
||||
x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf";
|
||||
x64suffix = "60";
|
||||
x86suffix = "60";
|
||||
homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
|
||||
};
|
||||
};
|
||||
|
||||
# Copied this file largely from the citrix-receiver package
|
||||
# Leaving this here even though there are no deprecations yet
|
||||
# for ease of future maintenance
|
||||
# for ease of future maintenance.
|
||||
#
|
||||
# The lifespans of Citrix products can be found here:
|
||||
# https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
|
||||
deprecatedVersions = let
|
||||
versions = [ ];
|
||||
in
|
||||
@@ -100,14 +103,14 @@ let
|
||||
busybox
|
||||
file
|
||||
gtk2
|
||||
gdk_pixbuf
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
glib
|
||||
gtk2
|
||||
atk
|
||||
gdk_pixbuf
|
||||
gdk-pixbuf
|
||||
cairo
|
||||
pango
|
||||
gnome3.dconf
|
||||
@@ -117,7 +120,6 @@ let
|
||||
xorg.libXinerama
|
||||
xorg.libXfixes
|
||||
libpng12
|
||||
libidn_134
|
||||
zlib
|
||||
gtk_engines
|
||||
freetype
|
||||
@@ -208,6 +210,7 @@ let
|
||||
inherit homepage;
|
||||
description = "Citrix Workspace";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "teamviewer-${version}";
|
||||
version = "14.3.4730";
|
||||
version = "14.4.2669";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "1k3vrkgkdh5wvws7xajgjvsqnmig64gnmf75sy7qq6lrpgp5l3nf";
|
||||
sha256 = "0vk782xpp8plbaz8cfggp0jrw7n8d5p9lv605pzmgxyq5h8z72za";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
{ stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
|
||||
, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
|
||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "x2goclient";
|
||||
version = "unstable-2018-11-30";
|
||||
version = "unstable-2019-07-24";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://code.x2go.org/x2goclient.git";
|
||||
rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8";
|
||||
sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4";
|
||||
rev = "704c4ab92d20070dd160824c9b66a6d1c56dcc49";
|
||||
sha256 = "1pndp3lfzwifyxqq0gps3p1bwakw06clbk6n8viv020l4bsfmq5f";
|
||||
};
|
||||
|
||||
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
||||
qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
@@ -28,9 +27,8 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installTargets = [ "install_client" "install_man" ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nx-libs}/bin:${openssh}/libexec";
|
||||
'';
|
||||
|
||||
qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graphical NoMachine NX3 remote desktop client";
|
||||
|
||||
Reference in New Issue
Block a user