diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 18:06:09 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 18:06:09 +0000 |
commit | 2b58d63ab600a18d013e4c7a9444062d91bd26ed (patch) | |
tree | 1a1a7be9b16bd885d155a8cb2d4ad5de87630e32 /pkgs/applications/video | |
parent | 6d3efc40c15671110885e76f3a1b31907fbe6a03 (diff) | |
download | nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.tar nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.tar.gz nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.tar.bz2 nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.tar.lz nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.tar.xz nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.tar.zst nixlib-2b58d63ab600a18d013e4c7a9444062d91bd26ed.zip |
* MPlayer had an undeclared dependency on zlib; found using the
improved purity enforcement in the gcc/ld-wrappers. svn path=/nixpkgs/trunk/; revision=898
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/MPlayer/builder.sh | 29 | ||||
-rw-r--r-- | pkgs/applications/video/MPlayer/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/MPlayer/win32codecs/builder.sh | 12 |
3 files changed, 27 insertions, 24 deletions
diff --git a/pkgs/applications/video/MPlayer/builder.sh b/pkgs/applications/video/MPlayer/builder.sh index ca3b4fa1a710..333219ef2c15 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 690994496650..2e8e231f11ef 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 75ee4963e263..60baa4e29709 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 |