From e92d68e3ab44e818876bdc1431c4d5d66b03e104 Mon Sep 17 00:00:00 2001 From: averelld Date: Sun, 20 May 2018 21:53:45 +0200 Subject: [PATCH] x2goclient: qt4 -> qt5 (#40811) --- .../networking/remote/x2goclient/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9052b09c3727..49ed30dc8a44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18692,7 +18692,7 @@ with pkgs; x11vnc = callPackage ../tools/X11/x11vnc { }; - x2goclient = callPackage ../applications/networking/remote/x2goclient { }; + x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; x2vnc = callPackage ../tools/X11/x2vnc { };