diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-06-29 23:48:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-06-29 23:48:19 +0000 |
| commit | 3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744 (patch) | |
| tree | 04db0d03d0d99ae8e80b9a026325977e46a7d2ba /pkgs/top-level | |
| parent | 186c269c70b728db146fcef95237c0d8b5bb2b61 (diff) | |
| download | nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.tar nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.tar.gz nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.tar.bz2 nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.tar.lz nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.tar.xz nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.tar.zst nixpkgs-3f45f2fe8249a8eeafa21ae1dbc17dcdb843e744.zip | |
* Play DVDs again with vlc.
svn path=/nixpkgs/trunk/; revision=5543
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/build-for-release.nix | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb9a373b2a3..f3d5f407916 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1312,8 +1312,8 @@ rec { inherit fetchurl stdenv libdvdcss; }; - libdvdplay = (import ../development/libraries/libdvdplay) { - inherit fetchurl stdenv libdvdread; + libdvdnav = import ../development/libraries/libdvdnav { + inherit fetchurl stdenv; }; mpeg2dec = (import ../development/libraries/mpeg2dec) { @@ -2208,7 +2208,8 @@ rec { vlc = (import ../applications/video/vlc) { inherit fetchurl stdenv perl x11 wxGTK - zlib mpeg2dec a52dec libmad ffmpeg; + zlib mpeg2dec a52dec libmad ffmpeg + libdvdread libdvdnav libdvdcss; inherit (xlibs) libXv; alsa = alsaLib; }; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 3bcd92bdb02..3cc122c17df 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -110,7 +110,7 @@ let { uulib valgrind vim -# vlc + vlc wget xchm xineUI |