Compare commits

..

No commits in common. "424e3cad9e2ecce7667b8302e96440e185c8421f" and "15fe826446bf04c806eb2cf04de1fd37be8a8b8f" have entirely different histories.

4 changed files with 64 additions and 23 deletions

View file

@ -23,9 +23,7 @@
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
chromium
vesktop vesktop
technorino
signal-desktop signal-desktop
thunderbird thunderbird
obs-studio obs-studio
@ -50,8 +48,7 @@
r2modman r2modman
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
(callPackage ../../../pkgs/passgen {}) (callPackage ../../../pkgs/chatterino7 {})
(callPackage ../../../pkgs/forex {})
]; ];
programs.ssh = { programs.ssh = {

View file

@ -2,7 +2,8 @@
this directory hosts derivations of packages not found in nixpkgs, and overrides. this directory hosts derivations of packages not found in nixpkgs, and overrides.
| name | description | | name | description |
| -------------- | ---------------------------------------------------------------------------- | | -------------- | ---------------------------------------------------------------------------------------------- |
| `jellyfin-rpc` | [discord rpc client](https://github.com/Radiicall/jellyfin-rpc) for jellyfin | | `chatterino7` | [7tv fork](https://github.com/SevenTV/chatterino7) of chatterino2, a chat client for twitch.tv |
| `overlays.nix` | has overlays that i use | | `jellyfin-rpc` | [discord rpc client](https://github.com/Radiicall/jellyfin-rpc) for jellyfin |
| `overlays.nix` | has overlays that i use |

View file

@ -0,0 +1,58 @@
{
stdenv,
lib,
cmake,
pkg-config,
fetchFromGitHub,
qt6,
boost,
openssl,
libsecret,
}:
stdenv.mkDerivation rec {
pname = "chatterino7";
version = "7.5.1";
src = fetchFromGitHub {
owner = "SevenTV";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T0H+p9hyNd73gETwLilXN0uzcF75TJgx/LzHqnC099M=";
fetchSubmodules = true;
};
nativeBuildInputs = [cmake pkg-config qt6.wrapQtAppsHook];
buildInputs = [
qt6.qtbase
qt6.qtsvg
qt6.qtimageformats
qt6.qttools
qt6.qt5compat
qt6.qtwayland
boost
openssl
libsecret
];
cmakeFlags = ["-DBUILD_WITH_QT6=ON"];
postInstall =
''
mkdir -p "$out/bin"
cp "bin/chatterino" "$out/bin"
''
+ ''
mkdir -p $out/share/icons/hicolor/256x256/apps
cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png
'';
meta = with lib; {
description = "Chat client for twitch.tv";
mainProgram = "chatterino";
longDescription = ''
Chatterino7 is a fork of Chatterino 2.
This fork mainly contains features that aren't accepted into Chatterino 2,
most notably 7TV subscriber features.
'';
homepage = "https://github.com/SevenTV/chatterino7";
license = licenses.mit;
maintainers = with maintainers; [notohh];
};
}

View file

@ -1,21 +1,6 @@
{lib, ...}: { {lib, ...}: {
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
(self: super: {
technorino =
super.chatterino2.overrideAttrs
(oldAttrs: {
nativeBuildInputs = with super; [cmake pkg-config];
buildInputs = with super; [qt6.wrapQtAppsHook qt6.qtbase qt6.qtsvg qt6.qtimageformats qt6.qttools qt6.qt5compat qt6.qtwayland boost openssl];
cmakeFlags = ["-DBUILD_WITH_QT6=ON" "-DBUILD_WITH_QTKEYCHAIN=OFF"];
src = super.chatterino2.src.override {
owner = "2547techno";
repo = "technorino";
rev = "nightly-build";
sha256 = "sha256-PY+K1l29wwG8ddqTxOwkbKb8CQoOBwbOeCgn0VTDptM=";
};
});
})
(final: prev: { (final: prev: {
spotify-player = prev.spotify-player.overrideAttrs (old: rec { spotify-player = prev.spotify-player.overrideAttrs (old: rec {
pname = "spotify-player"; pname = "spotify-player";