From 0809ab092eda2abdba665988a40a9d0f34d771dc Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 24 Apr 2026 23:50:34 -0700 Subject: [PATCH] squishyball: fix build with gcc15 --- pkgs/by-name/sq/squishyball/package.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/by-name/sq/squishyball/package.nix b/pkgs/by-name/sq/squishyball/package.nix index 224c754dab7a..b8bb813f5cf9 100644 --- a/pkgs/by-name/sq/squishyball/package.nix +++ b/pkgs/by-name/sq/squishyball/package.nix @@ -3,6 +3,7 @@ stdenv, autoreconfHook, fetchFromGitLab, + fetchDebianPatch, fetchpatch, flac, libao, @@ -47,6 +48,22 @@ stdenv.mkDerivation { url = "https://gitlab.xiph.org/xiph/squishyball/uploads/5609ceaf85ebb6dc297c0efe61b9a1b7/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch"; sha256 = "06llp7cd77f4vvhz8qdld551dnlpjxf98j7rmp3i1x1kng4f0iy3"; }) + + (fetchDebianPatch { + pname = "squishyball"; + version = "0.1~svn19085"; + debianRevision = "8"; + patch = "0006-Workaround-opaqueness-of-struct-term.patch"; + hash = "sha256-7zXPsJxIpQI2Ro+GNIZEASxHFrRqSUiXjQl9/KeHSAk="; + }) + + (fetchDebianPatch { + pname = "squishyball"; + version = "0.1~svn19085"; + debianRevision = "8"; + patch = "0007-ncurses-internals.patch"; + hash = "sha256-GzYV0Oas1Amte0m5XCAUfEMRUTYI3UticCdASCn+s28="; + }) ]; postInstall = ''