diff --git a/pkgs/README.md b/pkgs/README.md index 866cc0f..61c42a4 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -2,8 +2,7 @@ this directory hosts derivations of packages not found in nixpkgs, and overrides. -| name | description | -| -------------- | ---------------------------------------------------------------------------------------------- | -| `chatterino7` | [7tv fork](https://github.com/SevenTV/chatterino7) of chatterino2, a chat client for twitch.tv | -| `jellyfin-rpc` | [discord rpc client](https://github.com/Radiicall/jellyfin-rpc) for jellyfin | -| `overlays.nix` | has overlays that i use | +| name | description | +| -------------- | ---------------------------------------------------------------------------- | +| `jellyfin-rpc` | [discord rpc client](https://github.com/Radiicall/jellyfin-rpc) for jellyfin | +| `overlays.nix` | has overlays that i use | diff --git a/pkgs/chatterino7/default.nix b/pkgs/chatterino7/default.nix deleted file mode 100644 index d472eee..0000000 --- a/pkgs/chatterino7/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - 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]; - }; -} diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix index cf8567e..928f50a 100644 --- a/pkgs/overlays.nix +++ b/pkgs/overlays.nix @@ -1,6 +1,21 @@ {lib, ...}: { nixpkgs = { 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: { spotify-player = prev.spotify-player.overrideAttrs (old: rec { pname = "spotify-player";