From a5f897d4640c6475ecff444a81d9114ff41ed689 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Fri, 3 Jan 2025 14:48:55 +0000 Subject: [PATCH] Revert "libfishsound: fix build with gcc14" This reverts commit fdd1a8c1e02a2e9784ff73979c9e881e784578d9. reverting in to apply a more comprehensive fix --- .../li/libfishsound/fix-callbacks.patch | 20 ------------------- pkgs/by-name/li/libfishsound/package.nix | 4 ---- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/by-name/li/libfishsound/fix-callbacks.patch diff --git a/pkgs/by-name/li/libfishsound/fix-callbacks.patch b/pkgs/by-name/li/libfishsound/fix-callbacks.patch deleted file mode 100644 index 992efcf23ec8..000000000000 --- a/pkgs/by-name/li/libfishsound/fix-callbacks.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/libfishsound/flac.c -+++ b/src/libfishsound/flac.c -@@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void * data, int datasize) - #if FS_DECODE - static FLAC__StreamDecoderReadStatus - fs_flac_read_callback(const FLAC__StreamDecoder *decoder, -- FLAC__byte buffer[], unsigned int *bytes, -+ FLAC__byte buffer[], size_t *bytes, - void *client_data) - { - FishSound* fsound = (FishSound*)client_data; -@@ -346,7 +346,7 @@ dec_err: - #if FS_ENCODE - static FLAC__StreamEncoderWriteStatus - fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder, -- const FLAC__byte buffer[], unsigned bytes, -+ const FLAC__byte buffer[], size_t bytes, - unsigned samples, unsigned current_frame, - void *client_data) - { diff --git a/pkgs/by-name/li/libfishsound/package.nix b/pkgs/by-name/li/libfishsound/package.nix index 63b0838b4b01..0c5ea9c4c023 100644 --- a/pkgs/by-name/li/libfishsound/package.nix +++ b/pkgs/by-name/li/libfishsound/package.nix @@ -17,10 +17,6 @@ stdenv.mkDerivation rec { sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf"; }; - patches = [ - ./fix-callbacks.patch - ]; - propagatedBuildInputs = [ libvorbis speex