diff options
| author | Piper McCorkle <contact@piperswe.me> | 2021-10-16 10:49:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 17:49:59 +0200 |
| commit | 08c5aa32e4ca73ae614912db0557c8839e727bef (patch) | |
| tree | 868d02ac11cc89c4e48f5f0b400ef6e47d79f012 /pkgs/applications/video/vlc | |
| parent | 1daab6c7339f072293e9d77e80c7d558870a848a (diff) | |
vlc: remove live555 dependency on 32-bit ARM (#141215)
Diffstat (limited to 'pkgs/applications/video/vlc')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3a613f26ae68c..ce9a72aebf9a4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -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 |