philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

flac: update, enable tests

Browse source 
Fix includes in VLC.
Tried a few other programs using it, seems fine.
This commit is contained in:
Vladimír Čunát 2013-06-11 14:17:56 +02:00
parent 6fff888ae8
commit f724a5314b
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/audio/flac/default.nix
View file

@ -1,25 +1,19 @@
{ stdenv, fetchurl, libogg }:
stdenv.mkDerivation rec {
name = "flac-1.2.1";
name = "flac-1.3.0";
src = fetchurl {
url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
sha256 = "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs";
};
buildInputs = [ libogg ];
patches =
[ # Fix for building on GCC 4.3.
(fetchurl {
url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch";
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
})
];
doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
meta = {
homepage = http://flac.sourceforge.net;
homepage = http://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
};
}

9
pkgs/applications/video/vlc/default.nix
View file

@ -10,13 +10,18 @@
stdenv.mkDerivation rec {
name = "vlc-${version}";
version = "2.0.6";
version = "2.0.7";
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i";
sha256 = "052kfkpd0r2fwkyz97qhz2a368xqxa905qacrd1bkl2bkvahfc94";
};
postPatch = /* flac 1.3.0 fix */ ''
sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c
sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c
'';
buildInputs =
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt