Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Some VLC-related updates.

Browse Source 
* Variability :-)  Provide both Autoconf 2.59 and 2.60 (the former
  being the default for now).

svn path=/nixpkgs/trunk/; revision=5539
This commit is contained in:
Eelco Dolstra
2006-06-29 12:41:25 +00:00
parent a96763545d
commit d97fa85adf
10 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/top-level/all-packages.nix
View File

@@ -426,11 +426,18 @@ rec {
inherit fetchurl stdenv;
};
autoconf = (import ../development/tools/misc/autoconf) {
autoconf259 = (import ../development/tools/misc/autoconf) {
inherit fetchurl stdenv perl;
m4 = gnum4;
};
autoconf260 = (import ../development/tools/misc/autoconf-2.60) {
inherit fetchurl stdenv perl;
m4 = gnum4;
};
autoconf = autocon259;
automake17x = (import ../development/tools/misc/automake/automake-1.7.x.nix) {
inherit fetchurl stdenv perl autoconf;
};
@@ -1321,6 +1328,10 @@ rec {
inherit fetchurl stdenv;
};
ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv;
};
zvbi = (import ../development/libraries/zvbi) {
inherit fetchurl stdenv libpng x11;
pngSupport = true;
@@ -2196,8 +2207,8 @@ rec {
};
vlc = (import ../applications/video/vlc) {
inherit fetchurl stdenv libdvdcss wxGTK libdvdplay
mpeg2dec a52dec libmad x11;
inherit fetchurl stdenv perl x11 wxGTK
zlib mpeg2dec a52dec libmad ffmpeg;
inherit (xlibs) libXv;
alsa = alsaLib;
};