public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

live555: broken on aarch64

Browse Source
This commit is contained in:
c0bw3b 2018-11-18 17:50:27 +01:00
parent fb81d629ac
commit 525e397f64
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/vlc/default.nix
View File

@ -38,16 +38,17 @@ stdenv.mkDerivation rec {
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
libkate libtiger libv4l samba liboggz libass libdvbpsi libva libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
fluidsynth wayland wayland-protocols fluidsynth wayland wayland-protocols
] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optional jackSupport libjack2; ++ optional jackSupport libjack2;
nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];
enableParallelBuilding = true; enableParallelBuilding = true;
LIVE555_PREFIX = live555; LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null;
# vlc depends on a c11-gcc wrapper script which we don't have so we need to # vlc depends on a c11-gcc wrapper script which we don't have so we need to
# set the path to the compiler # set the path to the compiler

1
pkgs/development/libraries/live555/default.nix
View File

@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
homepage = http://www.live555.com/liveMedia/; homepage = http://www.live555.com/liveMedia/;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
}; };
} }