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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-05-21 20:21:48 -04:00
parent 60a666507c 0106dfcbeb
commit db4d77779c
83 changed files with 798 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/remote/x2goclient/default.nix
+7 -5
View File
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }:
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
stdenv.mkDerivation rec {
name = "x2goclient-${version}";
@@ -9,18 +10,19 @@ stdenv.mkDerivation rec {
sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
};
buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
qtbase qtsvg qtx11extras qttools phonon ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
--replace "lrelease-qt4" "${qt4}/bin/lrelease" \
--replace "qmake-qt4" "${qt4}/bin/qmake" \
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
--replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \
--replace "-o root -g root" ""
'';
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
enableParallelBuilding = true;