Skip to content

Commit

Permalink
Revert "x2goclient: move to qmake4Hook"
Browse files Browse the repository at this point in the history
This reverts commit 83406bc, 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.
  • Loading branch information
bjornfor committed May 29, 2016
1 parent e7c9684 commit 41eafd2
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pkgs/applications/networking/remote/x2goclient/default.nix
Original file line number Diff line number Diff line change
@@ -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}";
Expand All @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};

buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
nativeBuildInputs = [ makeWrapper qmake4Hook ];
nativeBuildInputs = [ makeWrapper ];

patchPhase = ''
substituteInPlace Makefile \
Expand All @@ -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;

Expand Down

0 comments on commit 41eafd2

Please sign in to comment.