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

Merge pull request #55896 from srhb/x2goclient-nxlibs

Browse Source 
x2goclient: Use nx-libs instead of nxproxy
This commit is contained in:
Sarah Brofeldt 2019-02-16 12:52:06 +01:00 committed by GitHub
commit 7e1fc7d0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh
{ stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4";
};
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
nativeBuildInputs = [ makeWrapper ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install_client" "install_man" ];
postInstall = ''
wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin:${openssh}/libexec";
wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nx-libs}/bin:${openssh}/libexec";
'';
meta = with stdenv.lib; {