diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-02-12 18:15:45 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-02-12 18:15:45 +0000 |
| commit | efb082287843d936fc5dcecb8fbcc580119f6705 (patch) | |
| tree | 999feaae044b36eacbd72110d4fffa08745f6025 /pkgs/applications/audio/vorbis-tools/default.nix | |
| parent | 260c0c9c9678e164a42c5bfd6cb18cd143f32c0b (diff) | |
| download | nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.tar nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.tar.gz nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.tar.bz2 nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.tar.lz nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.tar.xz nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.tar.zst nixpkgs-efb082287843d936fc5dcecb8fbcc580119f6705.zip | |
Allow compilation of `ogg123' by fixing `http_transport.c'.
svn path=/nixpkgs/trunk/; revision=10650
Diffstat (limited to 'pkgs/applications/audio/vorbis-tools/default.nix')
| -rw-r--r-- | pkgs/applications/audio/vorbis-tools/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 13fe5a48cfa..626dc1c9d96 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,8 +1,6 @@ {stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc , speex, flac}: -# FIXME: We'd need `libOggFLAC' too. - stdenv.mkDerivation { name = "vorbis-tools-1.1.1"; src = fetchurl { @@ -10,13 +8,11 @@ stdenv.mkDerivation { 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 = [ - ("--with-curl=" + curl) - ("--with-curl-libraries=" + curl + "/lib") - ("--with-curl-includes=" + curl + "/include") - ]; + patches = [ ./ogg123-curlopt-mute.patch ]; meta = { description = ''A set of command-line tools to manipulate Ogg Vorbis |