diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-21 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 18:01:07 +0000 |
| commit | 18ad263272038fdf1c1634e2b51a64284ef4957c (patch) | |
| tree | e7f4385a30b50370bf03e05846e50c59a087b59b /pkgs/applications/video | |
| parent | c68c4b3db87877e2ae520ffea2583ae35a0cb04d (diff) | |
| parent | 54962ddabc4cb652ab617a250ed4dc0bec54d1e3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 644e35468fb54..1715ce4a6a171 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" ++ optional - ((stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) && !crossBuild) + (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" ++ optional fribidiSupport "--enable-fribidi" ++ optional stdenv.isLinux "--enable-vidix" |