ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-14 00:22:44 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #248001 from matthiasbeyer/update-wt

Browse Source 
wt: qt4 -> qt5
This commit is contained in:
Nick Cao 2023-08-13 00:04:44 -06:00 committed by GitHub
commit 919c0e4550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/wt/default.nix
View File

@ -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=";

5
pkgs/top-level/all-packages.nix
View File

@ -25428,10 +25428,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 { };