diff options
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/chatterino2/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 19c91baf9a43e..cb5ec32d84216 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qt6, boost, openssl, libsecret }: stdenv.mkDerivation rec { pname = "chatterino2"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ]; + nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; + buildInputs = [ qt6.qtbase qt6.qtsvg qt6.qtimageformats qt6.qttools qt6.qt5compat boost openssl libsecret ]; + cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9629737b55dc6..ca6d5f8c37487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35811,7 +35811,7 @@ with pkgs; xwaylandSupport = false; }; - chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 { + chatterino2 = qt6Packages.callPackage ../applications/networking/instant-messengers/chatterino2 { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; |