public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow compilation of ogg123' by fixing http_transport.c'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10650
This commit is contained in:
Ludovic Courtès 2008-02-12 18:15:45 +00:00
parent 260c0c9c96
commit efb0822878
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/audio/vorbis-tools/default.nix
View File

@ -1,8 +1,6 @@
{stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc {stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc
, speex, flac}: , speex, flac}:
# FIXME: We'd need `libOggFLAC' too.
stdenv.mkDerivation { stdenv.mkDerivation {
name = "vorbis-tools-1.1.1"; name = "vorbis-tools-1.1.1";
src = fetchurl { src = fetchurl {
@ -10,13 +8,11 @@ stdenv.mkDerivation {
sha256 = "617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad"; sha256 = "617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad";
}; };
buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac glibc ]; # FIXME: Vorbis-tools expects `libOggFLAC', but this library was
# merged with `libFLAC' as of FLAC 1.1.3.
buildInputs = [ libogg libvorbis libao pkgconfig curl speex glibc flac ];
configureFlagsArray = [ patches = [ ./ogg123-curlopt-mute.patch ];
("--with-curl=" + curl)
("--with-curl-libraries=" + curl + "/lib")
("--with-curl-includes=" + curl + "/include")
];
meta = { meta = {
description = ''A set of command-line tools to manipulate Ogg Vorbis description = ''A set of command-line tools to manipulate Ogg Vorbis

13
pkgs/applications/audio/vorbis-tools/ogg123-curlopt-mute.patch Normal file
View File

@ -0,0 +1,13 @@
--- vorbis-tools-1.1.1/ogg123/http_transport.c 2005-06-13 15:11:44.000000000 +0200
+++ vorbis-tools-1.1.1/ogg123/http_transport.c 2008-02-12 18:38:41.000000000 +0100
@@ -116,7 +116,9 @@ void set_curl_opts (http_private_t *priv
if (inputOpts.ProxyTunnel)
curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
*/
+#ifdef CURLOPT_MUTE
curl_easy_setopt(handle, CURLOPT_MUTE, 1);
+#endif
curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);