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

x2goclient: move to qmake4Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:39:58 +03:00
parent 04e1b8eac4
commit 83406bc171
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "x2goclient-${version}"; name = "x2goclient-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper qmake4Hook ];
patchPhase = '' patchPhase = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
--replace "-o root -g root" "" --replace "-o root -g root" ""
''; '';
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; preConfigure = ''
qmakeFlags="$qmakeFlags ETCDIR=$out/etc"
'';
enableParallelBuilding = true; enableParallelBuilding = true;