diff options
| author | averelld <averelld@users.noreply.github.com> | 2018-05-20 21:53:45 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-20 21:53:45 +0200 |
| commit | e92d68e3ab44e818876bdc1431c4d5d66b03e104 (patch) | |
| tree | 6854098e5011baeba8b1a36ebe7625798e14fb5d | |
| parent | 74a0ff512c98c64ada1d95193784e77b7406cdaf (diff) | |
| download | nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.tar nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.tar.gz nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.tar.bz2 nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.tar.lz nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.tar.xz nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.tar.zst nixlib-e92d68e3ab44e818876bdc1431c4d5d66b03e104.zip | |
x2goclient: qt4 -> qt5 (#40811)
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/default.nix | 12 | ||||
| -rw-r--r-- | 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 { }; |