From 2a6ca481f1ae4370be9295a55d15b509d12b212a Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Wed, 22 Jan 2025 21:40:08 +0100 Subject: [PATCH] chatterino{2,7}: pin boost to 1.86 Upstream already released a patch[^1], but it's not yet released. It modifies submodules so it's difficult to apply, so we just use boost 1.86 until a new release is made. [^1]: https://github.com/Chatterino/chatterino2/pull/5832/commits/ec728f3ca70f9b201e3108c91f44817f3e38d668 --- pkgs/by-name/ch/chatterino2/package.nix | 74 +++++++++++++------------ pkgs/by-name/ch/chatterino7/package.nix | 2 + 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix index 5cd7c73a61095..7e4c4f6f7bbe3 100644 --- a/pkgs/by-name/ch/chatterino2/package.nix +++ b/pkgs/by-name/ch/chatterino2/package.nix @@ -3,42 +3,48 @@ callPackage, fetchFromGitHub, nix-update-script, + boost186, }: -(callPackage ./common.nix { }).overrideAttrs (finalAttrs: _: { - pname = "chatterino2"; - version = "2.5.2"; +(callPackage ./common.nix { + boost = boost186; +}).overrideAttrs + ( + finalAttrs: _: { + pname = "chatterino2"; + version = "2.5.2"; - src = fetchFromGitHub { - owner = "Chatterino"; - repo = "chatterino2"; - tag = "v${finalAttrs.version}"; - hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "Chatterino"; + repo = "chatterino2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw="; + fetchSubmodules = true; + }; - passthru = { - buildChatterino = args: callPackage ./common.nix args; - updateScript = nix-update-script { }; - }; + passthru = { + buildChatterino = args: callPackage ./common.nix args; + updateScript = nix-update-script { }; + }; - meta = { - description = "Chat client for Twitch chat"; - mainProgram = "chatterino"; - longDescription = '' - Chatterino is a chat client for Twitch chat. It aims to be an - improved/extended version of the Twitch web chat. Chatterino 2 is - the second installment of the Twitch chat client series - "Chatterino". - ''; - homepage = "https://github.com/Chatterino/chatterino2"; - changelog = "https://github.com/Chatterino/chatterino2/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - rexim - supa - marie - ]; - }; -}) + meta = { + description = "Chat client for Twitch chat"; + mainProgram = "chatterino"; + longDescription = '' + Chatterino is a chat client for Twitch chat. It aims to be an + improved/extended version of the Twitch web chat. Chatterino 2 is + the second installment of the Twitch chat client series + "Chatterino". + ''; + homepage = "https://github.com/Chatterino/chatterino2"; + changelog = "https://github.com/Chatterino/chatterino2/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + rexim + supa + marie + ]; + }; + } + ) diff --git a/pkgs/by-name/ch/chatterino7/package.nix b/pkgs/by-name/ch/chatterino7/package.nix index 44472bee0c366..3bff23f94c4cb 100644 --- a/pkgs/by-name/ch/chatterino7/package.nix +++ b/pkgs/by-name/ch/chatterino7/package.nix @@ -3,10 +3,12 @@ chatterino2, fetchFromGitHub, nix-update-script, + boost186, }: (chatterino2.buildChatterino { enableAvifSupport = true; + boost = boost186; }).overrideAttrs ( finalAttrs: _: {