From 886dd61777bd8ad1b6726b748902f87e90cfbfd4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 03:53:43 +0200 Subject: [PATCH] wt: qt4 -> qt5 (cherry picked from commit c1991546d17a09a5312b3e76b3ad56d7b736fe8f) Signed-off-by: Matthias Beyer --- pkgs/development/libraries/wt/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index c9adf68115bf..20cedde5bf1e 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu +{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qtbase, libharu , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz, icu }: @@ -19,11 +19,12 @@ let nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost doxygen qt48Full libharu + boost doxygen qtbase libharu pango fcgi firebird libmysqlclient postgresql graphicsmagick glew openssl pcre harfbuzz icu ]; + dontWrapQtApps = true; cmakeFlags = [ "-DWT_CPP_11_MODE=-std=c++11" "--no-warn-unused-cli" @@ -44,11 +45,6 @@ let }; }; in { - wt3 = generic { - version = "3.7.1"; - sha256 = "19gf5lbrc5shpvcdyzjh20k8zdj4cybxqvkhwqfl9rvhw89qr11k"; - }; - wt4 = generic { version = "4.9.1"; sha256 = "sha256-Qm0qqYB/CLVHUgKE9N83MgAWQ2YFdumrB0i84qYNto8="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 768bf1dc0f00..47fba8bd9065 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25375,10 +25375,7 @@ with pkgs; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; wt = wt4; - inherit (callPackages ../development/libraries/wt { - boost = boost175; - }) - wt3 + inherit (libsForQt5.callPackage ../development/libraries/wt { }) wt4; wxformbuilder = callPackage ../development/tools/wxformbuilder { };