diff options
| author | Rüdiger Sonderfeld <ruediger@c-plusplus.de> | 2014-08-19 16:24:58 +0200 |
|---|---|---|
| committer | Rüdiger Sonderfeld <ruediger@c-plusplus.de> | 2014-08-19 16:24:58 +0200 |
| commit | 4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a (patch) | |
| tree | f5c5c4e81a83bc56cb7b62e9912e8d8ae89f19a7 /pkgs/applications | |
| parent | 033c9bd18c2b90d8c7c5ad38712f3aff55b0d7b4 (diff) | |
| download | nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.tar nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.tar.gz nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.tar.bz2 nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.tar.lz nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.tar.xz nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.tar.zst nixpkgs-4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a.zip | |
mplayer: Add GNU FriBiDi support.
This is required by new versions of SMPlayer and other distros seem to enable it by default now as well.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 2103cdbe387..07bcb26569e 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, freetype, yasm , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null +, fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -25,6 +26,7 @@ assert fontconfigSupport -> (fontconfig != null); assert (!fontconfigSupport) -> (freefont_ttf != null); +assert fribidiSupport -> (fribidi != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); @@ -100,6 +102,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig freetype ] ++ optional fontconfigSupport fontconfig + ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext mesa ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv @@ -150,6 +153,7 @@ stdenv.mkDerivation rec { ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} + ${optionalString fribidiSupport "--enable-fribidi"} --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc @@ -160,6 +164,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = with stdenv.lib; optional fontconfigSupport "-lfontconfig" + ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] ; |