From 2b58d63ab600a18d013e4c7a9444062d91bd26ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Apr 2004 18:06:09 +0000
Subject: * MPlayer had an undeclared dependency on zlib; found using the  
 improved purity enforcement in the gcc/ld-wrappers.

svn path=/nixpkgs/trunk/; revision=898
---
 pkgs/applications/video/MPlayer/builder.sh         | 29 +++++++++++++---------
 pkgs/applications/video/MPlayer/default.nix        | 10 +++-----
 .../video/MPlayer/win32codecs/builder.sh           | 12 ++++-----
 pkgs/system/all-packages-generic.nix               |  2 +-
 4 files changed, 28 insertions(+), 25 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/video/MPlayer/builder.sh b/pkgs/applications/video/MPlayer/builder.sh
index ca3b4fa1a7100..333219ef2c154 100644
--- a/pkgs/applications/video/MPlayer/builder.sh
+++ b/pkgs/applications/video/MPlayer/builder.sh
@@ -1,17 +1,22 @@
-buildinputs="$freetype $x11 $alsa"
-. $stdenv/setup || exit 1
+buildInputs="$x11 $freetype $zlib $alsa"
+. $stdenv/setup
 
-tar xvfj $src || exit 1
-tar xvfj $fonts || exit 1
-cd MPlayer-* || exit 1
-./configure --prefix=$out --with-win32libdir=$win32codecs \
- --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
+postUnpack() {
+    unpackFile $fonts
+}
+postUnpack=postUnpack
+
+configureFlags="\
+ --with-win32libdir=$win32codecs \
  --with-reallibdir=$win32codecs \
  --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
  --disable-lirc --disable-svga --disable-libdv \
  --disable-vorbis --disable-png --disable-jpeg --disable-gif \
- --enable-runtime-cpudetection \
- || exit 1
-make || exit 1
-make install || exit 1
-cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1
+ --enable-runtime-cpudetection"
+
+postInstall() {
+    cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font
+}
+postInstall=postInstall
+
+genericBuild
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 690994496650f..2e8e231f11efd 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -1,5 +1,5 @@
 { alsaSupport ? false
-, stdenv, fetchurl, x11, freetype, alsa ? null}:
+, stdenv, fetchurl, x11, freetype, zlib, alsa ? null}:
 
 assert x11 != null && freetype != null;
 assert alsaSupport -> alsa != null;
@@ -17,12 +17,10 @@ stdenv.mkDerivation {
     md5 = "1ecd31d17b51f16332b1fcc7da36b312";
   };
 
-  alsaSupport = alsaSupport;
-
-  x11 = x11;
-  freetype = freetype;
-  alsa = if alsaSupport then alsa else null;
   win32codecs = (import ./win32codecs) {
     inherit stdenv fetchurl;
   };
+
+  alsa = if alsaSupport then alsa else null;
+  inherit alsaSupport x11 freetype zlib;
 }
diff --git a/pkgs/applications/video/MPlayer/win32codecs/builder.sh b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
index 75ee4963e2636..60baa4e29709a 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/builder.sh
+++ b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
@@ -1,7 +1,7 @@
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-mkdir $out || exit 1
-cd $out || exit 1
-tar xvfj $src || exit 1
-mv extralite/* . || exit 1
-rmdir extralite || exit 1
+mkdir $out
+cd $out
+tar xvfj $src
+mv extralite/* .
+rmdir extralite
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 2e6ef412c85c2..12f57713e407d 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -696,7 +696,7 @@ rec {
   };
 
   MPlayer = (import ../applications/video/MPlayer) {
-    inherit fetchurl stdenv freetype x11;
+    inherit fetchurl stdenv freetype x11 zlib;
     alsaSupport = true;
     alsa = alsaLib;
   };
-- 
cgit 1.4.1