tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
x2goclient: move to qmake4Hook
Nikolay Amiantov
9 years ago
83406bc1
04e1b8ea
+5
-3
1 changed file
expand all
collapse all
unified
split
pkgs
applications
networking
remote
x2goclient
default.nix
+5
-3
pkgs/applications/networking/remote/x2goclient/default.nix
···
1
1
-
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
1
1
+
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "x2goclient-${version}";
···
10
10
};
11
11
12
12
buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
13
13
-
nativeBuildInputs = [ makeWrapper ];
13
13
+
nativeBuildInputs = [ makeWrapper qmake4Hook ];
14
14
15
15
patchPhase = ''
16
16
substituteInPlace Makefile \
···
19
19
--replace "-o root -g root" ""
20
20
'';
21
21
22
22
-
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
22
22
+
preConfigure = ''
23
23
+
qmakeFlags="$qmakeFlags ETCDIR=$out/etc"
24
24
+
'';
23
25
24
26
enableParallelBuilding = true;
25
27