summary refs log tree commit diff
path: root/pkgs/applications/networking/remote
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-05-20 13:20:53 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-05-20 13:20:53 +0200
commit392e6de7d0cc9a65a7fd195fd1304310a30a8489 (patch)
treefefd8ca07d3e2665a4746ac0fd43d0c7965d660e /pkgs/applications/networking/remote
parent90c01001396e166fabfbcfb955de2a5409a95d9b (diff)
parent68cdc9c09e38e704a3bed720fc182f1907035375 (diff)
downloadnixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar
nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.gz
nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.bz2
nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.lz
nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.xz
nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.zst
nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r--pkgs/applications/networking/remote/x2goclient/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 904a6812c489..b470c6b39d3b 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
-  version = "4.1.0.0";
+  version = "4.1.1.1";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
+    sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
      substituteInPlace Makefile \
+       --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
        --replace "lrelease-qt4" "${qt4}/bin/lrelease" \
        --replace "qmake-qt4" "${qt4}/bin/qmake" \
        --replace "-o root -g root" ""