From 83406bc171ca2b385c49838e6ed5e89007a875b5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Apr 2016 02:39:58 +0300
Subject: [PATCH] x2goclient: move to qmake4Hook
---
.../applications/networking/remote/x2goclient/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 02a25b9a2704..09d4cf8dac5a 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 }:
+{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }:
stdenv.mkDerivation rec {
name = "x2goclient-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper qmake4Hook ];
patchPhase = ''
substituteInPlace Makefile \
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
--replace "-o root -g root" ""
'';
- makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
+ preConfigure = ''
+ qmakeFlags="$qmakeFlags ETCDIR=$out/etc"
+ '';
enableParallelBuilding = true;