cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #301301 from 0Supa/master

Browse source 
chatterino2: build with Qt6
This commit is contained in:
Aleksana 2024-04-13 15:19:52 +08:00 committed by GitHub
commit a8b040a743
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -19242,6 +19242,12 @@
githubId = 1939855; githubId = 1939855;
name = "Kimmo Suominen"; name = "Kimmo Suominen";
}; };
supa = {
email = "supa.codes@gmail.com";
github = "0Supa";
githubId = 36031171;
name = "Supa";
};
superbo = { superbo = {
email = "supernbo@gmail.com"; email = "supernbo@gmail.com";
github = "SuperBo"; github = "SuperBo";

20
pkgs/applications/networking/instant-messengers/chatterino2/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "chatterino2"; pname = "chatterino2";
@ -10,8 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ];
buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools 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 '' postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications" mkdir -p "$out/Applications"
mv bin/chatterino.app "$out/Applications/" mv bin/chatterino.app "$out/Applications/"
@ -32,6 +44,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ rexim ]; maintainers = with maintainers; [ rexim supa ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View file

@ -35745,7 +35745,7 @@ with pkgs;
xwaylandSupport = false; xwaylandSupport = false;
}; };
chatterino2 = libsForQt5.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; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
}; };