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.

1 files changed, 3 insertions, 5 deletions

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 09d4cf8dac5a0..02a25b9a27045 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -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 {
   name = "x2goclient-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
-  nativeBuildInputs = [ makeWrapper qmake4Hook ];
+  nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
      substituteInPlace Makefile \
@@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
        --replace "-o root -g root" ""
   '';
 
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags ETCDIR=$out/etc"
-  '';
+  makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
 
   enableParallelBuilding = true;