diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-21 20:20:29 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-21 20:21:48 -0400 |
commit | db4d77779c9b52a35c5a4306d36e2727cba1b162 (patch) | |
tree | 406873a406559b2417b1959f750c27cf56af4df3 /pkgs/applications/networking/remote | |
parent | 60a666507c1511ce48cf933ce6d4e8d727899d91 (diff) | |
parent | 0106dfcbeb56742503a89309c60a95433514226e (diff) | |
download | nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.gz nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.bz2 nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.lz nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.xz nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.zst nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/x2goclient/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index b470c6b39d3b..a4d2e85a9119 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }: +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, +makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; @@ -9,18 +10,19 @@ stdenv.mkDerivation rec { sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; }; - buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ]; + buildInputs = [ cups libssh libXpm nxproxy openldap openssh + qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; patchPhase = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ - --replace "lrelease-qt4" "${qt4}/bin/lrelease" \ - --replace "qmake-qt4" "${qt4}/bin/qmake" \ + --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ + --replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \ --replace "-o root -g root" "" ''; - makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; enableParallelBuilding = true; |