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

Merge pull request #126576 from mkg20001/x2go-backport

This commit is contained in:
Maciej Krüger 2021-06-11 09:50:42 +00:00 committed by GitHub
parent 3fdff5f4b0 6d9d295e38
commit 0f4f2317c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -1,20 +1,20 @@
{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh { lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
mkDerivation { mkDerivation rec {
pname = "x2goclient"; pname = "x2goclient";
version = "unstable-2019-07-24"; version = "4.1.2.2";
src = fetchgit { src = fetchurl {
url = "git://code.x2go.org/x2goclient.git"; url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz";
rev = "704c4ab92d20070dd160824c9b66a6d1c56dcc49"; sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
sha256 = "1pndp3lfzwifyxqq0gps3p1bwakw06clbk6n8viv020l4bsfmq5f";
}; };
buildInputs = [ cups libssh libXpm nx-libs openldap openssh buildInputs = [ cups libssh libXpm nx-libs openldap openssh
qtbase qtsvg qtx11extras qttools phonon pkg-config ]; qtbase qtsvg qtx11extras qttools phonon pkg-config ];
postPatch = '' postPatch = ''
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
@ -33,6 +33,7 @@ mkDerivation {
meta = with lib; { meta = with lib; {
description = "Graphical NoMachine NX3 remote desktop client"; description = "Graphical NoMachine NX3 remote desktop client";
homepage = "http://x2go.org/"; homepage = "http://x2go.org/";
maintainers = with maintainers; [ mkg20001 ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
}; };