diff options
author | K900 <me@0upti.me> | 2023-11-12 11:17:56 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-12-03 14:48:56 +0300 |
commit | 5d563af1ec505516ab1f7f901d0119ee0d131dda (patch) | |
tree | e1c8beaa307fa85044ce6621bc5dbd13509f523d | |
parent | 194dd385329d2385871914542796f1c1ac91d946 (diff) |
futuresql: add Qt6 support
-rw-r--r-- | pkgs/development/libraries/futuresql/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/qt6-packages.nix | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/futuresql/default.nix b/pkgs/development/libraries/futuresql/default.nix index 2adc148701a74..a6eb7c44708f7 100644 --- a/pkgs/development/libraries/futuresql/default.nix +++ b/pkgs/development/libraries/futuresql/default.nix @@ -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; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e655c34c7e824..2c35624ddb2af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddfdb4d6ccfea..bfbfaeec30c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 4d3754254765c..e9c99e68e9df5 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 5dee4e79af89b..1d6f8694dd5fe 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -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; }; |