diff options
| author | Peter Hoeg <peter@hoeg.com> | 2024-03-05 08:32:00 +0100 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2024-03-07 01:47:43 -0800 |
| commit | d4f34d235d94b5b93483e6a45417f7f7e39b9d0f (patch) | |
| tree | 7c5a2cb6af046e29b1a30d7236283b0861306826 /pkgs/applications/networking/instant-messengers/quaternion | |
| parent | 8243a08149705f52dde1b310e07a679c32422695 (diff) | |
quaternion: add support for qt6
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/quaternion')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/quaternion/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index a900061d06676..5111b7424f44c 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -4,7 +4,7 @@ , cmake , wrapQtAppsHook , qtbase -, qtquickcontrols2 +, qtquickcontrols2 ? null # only a separate package on qt5 , qtkeychain , qtmultimedia , qttools @@ -13,14 +13,18 @@ , olm }: -stdenv.mkDerivation rec { +let + inherit (lib) cmakeBool; + +in +stdenv.mkDerivation (finalAttrs: { pname = "quaternion"; version = "0.0.96.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "Quaternion"; - rev = "refs/tags/${version}"; + rev = finalAttrs.version; hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI="; }; @@ -36,8 +40,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + # qt6 needs UTF + env.LANG = "C.UTF-8"; + cmakeFlags = [ - "-DBUILD_WITH_QT6=OFF" + # drop this from 0.0.97 onwards as it will be qt6 only + (cmakeBool "BUILD_WITH_QT6" ((lib.versions.major qtbase.version) == "6")) ]; postInstall = @@ -55,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://matrix.org/ecosystem/clients/quaternion/"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - inherit (qtquickcontrols2.meta) platforms; + inherit (qtbase.meta) platforms; }; -} +}) |