diff options
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/a52dec/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/mpeg2dec/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/games/exult/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/networking/par2cmdline/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/build-for-release.nix | 8 |
7 files changed, 51 insertions, 20 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 0d499008b0c..b774cd28b62 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -8,11 +8,11 @@ assert libdvdread.libdvdcss == libdvdcss; assert xvSupport -> libXv != null; stdenv.mkDerivation { - name = "vlc-0.8.6d"; + name = "vlc-0.8.6h"; src = fetchurl { - url = http://download.videolan.org/pub/videolan/vlc/0.8.6d/vlc-0.8.6d.tar.bz2; - sha256 = "019jw9cp7fbmhbmlbwvjgpamxwx0rdajyxab2sbmh4n6v04fl266"; + url = http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2; + sha256 = "08bj6ndxj0f7jdsif43535qyavpy13wni93z7c2790i2d748gvah"; }; buildInputs = [ @@ -20,8 +20,7 @@ stdenv.mkDerivation { zlib mpeg2dec a52dec libmad ffmpeg alsa libdvdread # <- for "simple" DVD playback libdvdnav libdvdcss # <- for DVD playback with menus - (if xvSupport then libXv else null) - ]; + ] ++ stdenv.lib.optional xvSupport libXv; # Ensure that libdvdcss will be found without having to set LD_LIBRARY_PATH. NIX_LDFLAGS = "-ldvdcss"; diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 46dfe38c455..8fb0d4c527d 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,7 +1,8 @@ -args: with args; +{stdenv, fetchurl}: stdenv.mkDerivation rec { name = "a52dec-0.7.4"; + src = fetchurl { url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz"; sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; @@ -9,7 +10,9 @@ stdenv.mkDerivation rec { configureFlags = "--enable-shared --disable-static"; + NIX_CFLAGS_COMPILE = "-fpic"; + meta = { - homepage = http://liba52.sourceforge.net; + homepage = http://liba52.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix index 7ee4236296d..8b29deba56f 100644 --- a/pkgs/development/libraries/mpeg2dec/default.nix +++ b/pkgs/development/libraries/mpeg2dec/default.nix @@ -1,9 +1,17 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "mpeg2dec-20050802"; + name = "mpeg2dec-0.4.1"; + src = fetchurl { - url = ftp://ftp.u-strasbg.fr/pub/videolan/vlc/0.8.4a/contrib/mpeg2dec-20050802.tar.gz; - md5 = "79b3559a9354085fcebb1460dd93d237"; + url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.1.tar.gz; + sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7"; + }; + + configureFlags = "--enable-shared --disable-static"; + + meta = { + homepage = http://libmpeg2.sourceforge.net/; + description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 93980504440..35ef94c69db 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation { md5 = "0fc88dee74a91724d25373ba0a8670ba"; }; + # Patches for building on x86_64 and gcc 4.x. + patches = [ + (fetchurl { + url = "http://www.rocklinux.net/sources/package/stf/exult/exult-gcc4.patch"; + sha256 = "1jlikxcpsi3yfchan3jbyi66fcyr18m7kfmsa946lwh3kzckszm7"; + }) + ]; + buildInputs = [SDL SDL_mixer zlib libpng unzip]; NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL"; @@ -24,9 +32,10 @@ stdenv.mkDerivation { url = mirror://sourceforge/exult/U7MusicOGG_2of2.zip; md5 = "cdae5956d7c52f35e90317913a660123"; }) - ]; + ]; meta = { + homepage = http://exult.sourceforge.net/; description = "A reimplementation of the Ultima VII game engine"; }; } diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 6da3ce0bc37..c94ab37f1ea 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -2,8 +2,21 @@ stdenv.mkDerivation { name = "par2cmdline-0.4"; + src = fetchurl { url = mirror://sourceforge/parchive/par2cmdline-0.4.tar.gz; md5 = "1551b63e57e3c232254dc62073b723a9"; }; + + patches = [ + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/par2cmdline/files/par2cmdline-0.4-gcc4.patch?rev=1.1.1.1"; + sha256 = "1xrkr13qw5vqi2qbr2p43nqbq83nywk4bgvq7nfvrca4z60s787d"; + }) + ]; + + meta = { + homepage = http://parchive.sourceforge.net/; + description = "A command-line tool for repairing downloaded files using PARs (parity archives)"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e40ba1d541..f17be5a1182 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -895,8 +895,7 @@ let pkgs = rec { }; par2cmdline = import ../tools/networking/par2cmdline { - inherit fetchurl; - stdenv = overrideGCC stdenv gcc34; + inherit fetchurl stdenv; }; parted = import ../tools/misc/parted { @@ -6484,10 +6483,11 @@ let pkgs = rec { vlc = import ../applications/video/vlc { inherit fetchurl stdenv perl x11 wxGTK - zlib mpeg2dec a52dec libmad ffmpeg + zlib mpeg2dec a52dec libmad libdvdread libdvdnav libdvdcss; inherit (xlibs) libXv; alsa = alsaLib; + ffmpeg = ffmpeg_svn; }; vorbisTools = import ../applications/audio/vorbis-tools { @@ -6705,8 +6705,7 @@ let pkgs = rec { } null; exult = import ../games/exult { - inherit fetchurl SDL SDL_mixer zlib libpng unzip; - stdenv = overrideGCC stdenv gcc34; + inherit fetchurl stdenv SDL SDL_mixer zlib libpng unzip; }; fsg = import ../games/fsg { diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index f7247f4bdbe..6ace81c9b14 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -114,7 +114,6 @@ let pciutils perl php - pidgin pkgconfig postgresql procps @@ -154,7 +153,6 @@ let vlc w3m wget - wine wirelesstools wxHaskell x11_ssh_askpass @@ -205,9 +203,9 @@ let i686LinuxPkgs = commonLinuxPkgs "i686-linux" // { inherit (allPackages {system = "i686-linux";}) - aterm apacheAnt aspectj + aterm batik ecj eclipsesdk @@ -220,12 +218,14 @@ let jrePlugin keen4 mono + pidgin postgresql_jdbc sdf strategoxt strategoxtUtils syslinux uml + wine xorg_sys_opengl ; }; @@ -265,10 +265,10 @@ let #automake19x curl docbook5 + docbook5_xsl docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl - docbook5_xsl libtool libxml2 libxslt |