From a986892985ff9639224acdcaeb3453c9772343fd Mon Sep 17 00:00:00 2001 From: 0Supa Date: Wed, 3 Apr 2024 20:08:48 +0300 Subject: [PATCH 1/5] chatterino2: build with Qt6 --- .../networking/instant-messengers/chatterino2/default.nix | 7 ++++--- 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 19c91baf9a43..cb5ec32d8421 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 9629737b55dc..ca6d5f8c3748 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; }; From 279ba486a7f09f55d74e5748d649e4e56793d44c Mon Sep 17 00:00:00 2001 From: 0Supa Date: Wed, 3 Apr 2024 20:09:28 +0300 Subject: [PATCH 2/5] maintainers: add supa --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9f5eedb646c1..7c9fa817b58d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19061,6 +19061,12 @@ githubId = 1939855; name = "Kimmo Suominen"; }; + supa = { + email = "supa.codes@gmail.com"; + github = "0Supa"; + githubId = 36031171; + name = "Supa"; + }; superbo = { email = "supernbo@gmail.com"; github = "SuperBo"; From 756672d106479410e71e8f8db16f34d9d4804f71 Mon Sep 17 00:00:00 2001 From: 0Supa Date: Wed, 3 Apr 2024 20:10:18 +0300 Subject: [PATCH 3/5] chatterino2: add supa as maintainer --- .../networking/instant-messengers/chatterino2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index cb5ec32d8421..8ad75c483737 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 ]; }; } From 943b7323ece9aabedb9ea1063a75f4598c1e4dad Mon Sep 17 00:00:00 2001 From: 0Supa Date: Sun, 7 Apr 2024 11:58:15 +0300 Subject: [PATCH 4/5] chatterino2: use `callPackage` directly --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca6d5f8c3748..f809bd122f07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35811,7 +35811,7 @@ with pkgs; xwaylandSupport = false; }; - chatterino2 = qt6Packages.callPackage ../applications/networking/instant-messengers/chatterino2 { + chatterino2 = callPackage ../applications/networking/instant-messengers/chatterino2 { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; 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: [PATCH 5/5] chatterino2: include qtwayland Co-authored-by: Aleksana --- .../instant-messengers/chatterino2/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 8ad75c483737..5e61fc78091e 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"