summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Foremny <aforemny@posteo.de>2023-08-14 21:45:22 +0200
committerAlexander Foremny <aforemny@posteo.de>2023-08-14 23:05:57 +0200
commitacd3749ecf95bbd00f9ca583042377f6271ffc5e (patch)
tree6d1db4b2c397d544d9411c50a5cf00dbce5a3835
parentMerge pull request #243511 from tweag/lib.lists.hasPrefix (diff)
downloadnixpkgs-origin/feature/mplayer-enable-build-on-aarch64-linux.tar.gz
mplayer: enable build on aarch64-linuxorigin/feature/mplayer-enable-build-on-aarch64-linux
Without disabling vidix, mplayer does not build on aarch64-linux.
-rw-r--r--pkgs/applications/video/mplayer/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index e384c1f5c194..880ea831f186 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
(stdenv.hostPlatform.isx86 && !crossBuild)
"--enable-runtime-cpudetection"
++ optional fribidiSupport "--enable-fribidi"
- ++ optional stdenv.isLinux "--enable-vidix"
+ ++ optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix"
++ optional stdenv.isLinux "--enable-fbdev"
++ optionals (crossBuild) [
"--enable-cross-compile"
@@ -203,6 +203,6 @@ stdenv.mkDerivation rec {
homepage = "http://mplayerhq.hu";
license = licenses.gpl2Only;
maintainers = with maintainers; [ eelco ];
- platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
};
}