alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #190173 from SuperSandro2000/mpv

Browse source 
mpv: fix cross compilation

Without wayland-scanner, the autodetection fails.
This commit is contained in:
Anderson Torres 2022-09-08 22:02:27 -03:00 committed by GitHub
parent 99d75fb689 63be0d9b2c
commit 30a4e9fbb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/video/mpv/default.nix
View file

@ -24,6 +24,7 @@
, waylandSupport ? stdenv.isLinux
, wayland
, wayland-protocols
, wayland-scanner
, libxkbcommon
, x11Support ? stdenv.isLinux
@ -100,6 +101,8 @@ in stdenv.mkDerivation rec {
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "
+ lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
dontAddWafCrossFlags = true;
wafConfigureFlags = [
"--enable-libmpv-shared"
"--enable-manpage-build"
@ -127,7 +130,8 @@ in stdenv.mkDerivation rec {
python3
wafHook
which
] ++ lib.optionals swiftSupport [ swift ];
] ++ lib.optionals swiftSupport [ swift ]
++ lib.optionals waylandSupport [ wayland-scanner ];
buildInputs = [
ffmpeg