cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vlc: remove live555 dependency on 32-bit ARM (#141215)

Browse source
This commit is contained in:
Piper McCorkle 2021-10-16 10:49:59 -05:00 committed by GitHub
parent 1daab6c733
commit 08c5aa32e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/vlc/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
fluidsynth wayland wayland-protocols ncurses srt
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
] ++ optional (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
++ optional jackSupport libjack2
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null;
LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) then live555 else null;
# vlc depends on a c11-gcc wrapper script which we don't have so we need to
# set the path to the compiler