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

Revert "x2goclient: move to qmake4Hook" 

This reverts commit 83406bc171, because
it broke the build.

x2goclient requires to be built with its top-level (hand coded) Makefile
(in accordance with upstream documentation). Invoking qmake directly on
the .pro file, without specifying a separate build tree, will overwrite
the Makefile and break the build.

For instance, there are no install rules in the .pro file. That exists
only in the Makefile.
This commit is contained in:
Bjørn Forsman 2016-05-29 11:36:27 +02:00
parent e7c9684217
commit 41eafd25a0
1 changed files with 3 additions and 5 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, qmake4Hook }: { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
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 qmake4Hook ]; nativeBuildInputs = [ makeWrapper ];
patchPhase = '' patchPhase = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
--replace "-o root -g root" "" --replace "-o root -g root" ""
''; '';
preConfigure = '' makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
qmakeFlags="$qmakeFlags ETCDIR=$out/etc"
'';
enableParallelBuilding = true; enableParallelBuilding = true;