diff options
| author | Will Dietz <github@wdtz.org> | 2017-06-14 10:44:33 -0500 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2017-06-14 17:44:33 +0200 |
| commit | b2660fe3cca8fd87d1def86798423783726f1906 (patch) | |
| tree | 80960f44c7490c5a803c4756402367a769a037f7 /pkgs/applications/video/mplayer/default.nix | |
| parent | ca17f3b8efc48af4f8a6128c1d5de7146053af40 (diff) | |
| download | nixlib-b2660fe3cca8fd87d1def86798423783726f1906.tar nixlib-b2660fe3cca8fd87d1def86798423783726f1906.tar.gz nixlib-b2660fe3cca8fd87d1def86798423783726f1906.tar.bz2 nixlib-b2660fe3cca8fd87d1def86798423783726f1906.tar.lz nixlib-b2660fe3cca8fd87d1def86798423783726f1906.tar.xz nixlib-b2660fe3cca8fd87d1def86798423783726f1906.tar.zst nixlib-b2660fe3cca8fd87d1def86798423783726f1906.zip | |
mplayer: Use system ffmpeg instead of vendored version. (#26572)
Fixes use of mplayer with https:// URL's.
Diffstat (limited to 'pkgs/applications/video/mplayer/default.nix')
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index ba02583a2744..37b424d922ba 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i /^_install_strip/d configure + + rm -rf ffmpeg ''; buildInputs = with stdenv.lib; @@ -159,6 +161,7 @@ stdenv.mkDerivation rec { ${optionalString stdenv.isLinux "--enable-vidix"} ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio + --disable-ffmpeg_a ''; NIX_LDFLAGS = with stdenv.lib; |