Author: urkud
Date: Tue Jun 7 21:50:05 2011
New Revision: 27380
URL: https://svn.nixos.org/websvn/nix/?rev=27380&sc=1
Log:
Add flac, pulseaudio, libmng, libxcb
I need flac, pulseaudio and xcb.
Modified:
nixpkgs/trunk/pkgs/development/libraries/xine-lib/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/xine-lib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/xine-lib/default.nix Tue Jun
7 21:49:53 2011 (r27379)
+++ nixpkgs/trunk/pkgs/development/libraries/xine-lib/default.nix Tue Jun
7 21:50:05 2011 (r27380)
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, alsaLib, mesa, aalib
+{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib
, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
+, flac, libcaca, pulseaudio, libmng
}:
stdenv.mkDerivation rec {
@@ -10,13 +11,14 @@
sha256 = "0x47kmsaxx1bv8w2cacvzls3sjw9y4vk82rd94km1m1s6k2wcxv2";
};
- buildInputs =
- [ xlibs.xlibs pkgconfig xlibs.libXv xlibs.libXinerama alsaLib mesa aalib
- libvorbis libtheora speex perl ffmpeg
- # removed SDL dependency; it's a big dependency and doesn't seem
- # particularly useful here.
- ];
-
+ buildNativeInputs = [ pkgconfig perl ];
+
+ buildInputs = [
+ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
+ alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac
+ libcaca pulseaudio libmng
+ ];
+
NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";
propagatedBuildInputs = [zlib];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
