Revert "x2goclient: move to qmake4Hook"

This reverts commit 83406bc171ca2b385c49838e6ed5e89007a875b5, 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.

+3 -5
+3 -5
pkgs/applications/networking/remote/x2goclient/default.nix
··· 1 - { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }: 2 3 stdenv.mkDerivation rec { 4 name = "x2goclient-${version}"; ··· 10 }; 11 12 buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; 13 - nativeBuildInputs = [ makeWrapper qmake4Hook ]; 14 15 patchPhase = '' 16 substituteInPlace Makefile \ ··· 19 --replace "-o root -g root" "" 20 ''; 21 22 - preConfigure = '' 23 - qmakeFlags="$qmakeFlags ETCDIR=$out/etc" 24 - ''; 25 26 enableParallelBuilding = true; 27
··· 1 + { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: 2 3 stdenv.mkDerivation rec { 4 name = "x2goclient-${version}"; ··· 10 }; 11 12 buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; 13 + nativeBuildInputs = [ makeWrapper ]; 14 15 patchPhase = '' 16 substituteInPlace Makefile \ ··· 19 --replace "-o root -g root" "" 20 ''; 21 22 + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; 23 24 enableParallelBuilding = true; 25