diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-05-03 14:46:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-05-03 14:46:55 +0000 |
| commit | b9686c27ed9ac993923b6e4ec2234dc0cf0b864d (patch) | |
| tree | 61bbb64e8e8125e378bd74eb810ef9d6dbae8731 /pkgs/system/all-packages-generic.nix | |
| parent | d357f1a8ed3ffabae7310e9ece83af744a1d7f1a (diff) | |
| parent | d811b4c9d8db98c7667c9308afe949d445400bde (diff) | |
* Merge r990 into 0.5-stable. backups/0.5-stable@34171 0.5-stable
svn path=/nixpkgs/branches/0.5-stable/; revision=993
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 27774f82da736..6d605f54f0462 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -571,6 +571,7 @@ rec { MPlayer = (import ../applications/video/MPlayer) { inherit fetchurl stdenv freetype x11 zlib; + inherit (xlibs) libXv; alsaSupport = true; alsa = alsaLib; }; @@ -582,6 +583,7 @@ rec { vlc = (import ../applications/video/vlc) { inherit fetchurl stdenv wxGTK libdvdcss libdvdplay mpeg2dec a52dec libmad x11; + inherit (xlibs) libXv; alsa = alsaLib; }; @@ -589,6 +591,7 @@ rec { inherit fetchurl stdenv pkgconfig perl python scrollkeeper gettext zvbi libjpeg libpng x11; inherit (gnome) libgnomeui libglade esound; + inherit (xlibs) libXv libXext; teletextSupport = true; jpegSupport = true; pngSupport = true; |