BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

futuresql: add Qt6 support

Browse source
This commit is contained in:
K900 2023-11-12 11:17:56 +03:00
parent 194dd38532
commit 5d563af1ec
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/futuresql/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }:
{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, qtbase }:
stdenv.mkDerivation rec {
pname = "futuresql";
version = "0.1.1";
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ qtbase ];
cmakeFlags = ["-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}"];
# a library, nothing to wrap
dontWrapQtApps = true;

1
pkgs/top-level/aliases.nix
View file

@ -266,6 +266,7 @@ mapAliases ({
foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
fractal-next = fractal; # added 2023-11-25
fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
futuresql = libsForQt5.futuresql; # added 2023-11-11
fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13

2
pkgs/top-level/all-packages.nix
View file

@ -19188,8 +19188,6 @@ with pkgs;
funzzy = callPackage ../development/tools/misc/funzzy { };
futuresql = libsForQt5.callPackage ../development/libraries/futuresql { };
fzf-make = callPackage ../development/tools/misc/fzf-make { };
gede = libsForQt5.callPackage ../development/tools/misc/gede { };

2
pkgs/top-level/qt5-packages.nix
View file

@ -96,6 +96,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
futuresql = callPackage ../development/libraries/futuresql { };
qgpgme = callPackage ../development/libraries/gpgme { };
grantlee = callPackage ../development/libraries/grantlee/5 { };

2
pkgs/top-level/qt6-packages.nix
View file

@ -31,6 +31,8 @@ makeScopeWithSplicing' {
# LIBRARIES
kdsoap = callPackage ../development/libraries/kdsoap { };
futuresql = callPackage ../development/libraries/futuresql { };
qca = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca {
inherit (qt6) qtbase qt5compat;
};