nixpkgs/pkgs/applications/video/vlc
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
..
default.nix svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00
zlib.patch * Fix building VLC with zlib 1.2.6. 2012-02-18 17:23:17 +00:00