sox: musl does not support pipe rewind

Disable the pipe rewind related feature since musl has no support for it.
This commit is contained in:
Walter Franzini 2019-06-07 18:01:26 +02:00 committed by Symphorien Gibol
parent 92225849b0
commit 42e689e5bd
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,24 @@
From e7446c9bcb47674c9d0ee3b5bab129e9b86eb1c9 Mon Sep 17 00:00:00 2001
From: Walter Franzini <walter.franzini@gmail.com>
Date: Fri, 7 Jun 2019 17:57:11 +0200
Subject: [PATCH] musl does not support rewind pipe, make it build anyway
---
src/formats.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/formats.c b/src/formats.c
index f3efe764..477bf451 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -424,7 +424,6 @@ static void UNUSED rewind_pipe(FILE * fp)
/* To fix this #error, either simply remove the #error line and live without
* file-type detection with pipes, or add support for your compiler in the
* lines above. Test with cat monkey.wav | ./sox --info - */
- #error FIX NEEDED HERE
#define NO_REWIND_PIPE
(void)fp;
#endif
--
2.19.2

View File

@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
# configure.ac uses pkg-config only to locate libopusfile # configure.ac uses pkg-config only to locate libopusfile
nativeBuildInputs = optional enableOpusfile pkg-config; nativeBuildInputs = optional enableOpusfile pkg-config;
patches = [ ./0001-musl-rewind-pipe-workaround.patch ];
buildInputs = buildInputs =
optional (enableAlsa && stdenv.isLinux) alsaLib ++ optional (enableAlsa && stdenv.isLinux) alsaLib ++
optional enableLibao libao ++ optional enableLibao libao ++