From a986892985ff9639224acdcaeb3453c9772343fd Mon Sep 17 00:00:00 2001 From: 0Supa Date: Wed, 3 Apr 2024 20:08:48 +0300 Subject: chatterino2: build with Qt6 --- .../networking/instant-messengers/chatterino2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/networking/instant-messengers') 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/" -- cgit 1.4.1 From 756672d106479410e71e8f8db16f34d9d4804f71 Mon Sep 17 00:00:00 2001 From: 0Supa Date: Wed, 3 Apr 2024 20:10:18 +0300 Subject: chatterino2: add supa as maintainer --- pkgs/applications/networking/instant-messengers/chatterino2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/networking/instant-messengers') diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index cb5ec32d84216..8ad75c483737d 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ rexim ]; + maintainers = with maintainers; [ rexim supa ]; }; } -- cgit 1.4.1 From dfc2c8816901ba3804059026747f431c0e66161d Mon Sep 17 00:00:00 2001 From: Supa <36031171+0Supa@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:43:08 +0300 Subject: chatterino2: include qtwayland Co-authored-by: Aleksana --- .../networking/instant-messengers/chatterino2/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/networking/instant-messengers') diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 8ad75c483737d..5e61fc78091e6 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -11,7 +11,18 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; - buildInputs = [ qt6.qtbase qt6.qtsvg qt6.qtimageformats qt6.qttools qt6.qt5compat boost openssl libsecret ]; + buildInputs = [ + qt6.qtbase + qt6.qtsvg + qt6.qtimageformats + qt6.qttools + qt6.qt5compat + boost + openssl + libsecret + ] ++ lib.optionals stdenv.isLinux [ + qt6.qtwayland + ]; cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" -- cgit 1.4.1