diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/applications/video/vlc | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/applications/video/vlc')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/vlc/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/video/vlc/default.nix b/nixpkgs/pkgs/applications/video/vlc/default.nix index 46669dff5306..ce9a72aebf9a 100644 --- a/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -2,7 +2,7 @@ , libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska -, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp +, libvorbis, libtheora, speex, lua5, libgcrypt, libgpg-error, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { # needing them buildInputs = [ zlib a52dec libmad faad2 ffmpeg alsa-lib libdvdnav libdvdnav.libdvdread - libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror + libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpg-error libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva 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 |