diff options
| author | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-11-18 17:50:27 +0100 |
|---|---|---|
| committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-11-18 17:50:27 +0100 |
| commit | 525e397f643749336c352722c3ea092babf50716 (patch) | |
| tree | 9b2cac74960d8089d1c233ec826e7d3e6e2ba105 | |
| parent | fb81d629ac99f9dd5a78949dbf5ba984d81a67f3 (diff) | |
| download | nixpkgs-525e397f643749336c352722c3ea092babf50716.tar nixpkgs-525e397f643749336c352722c3ea092babf50716.tar.gz nixpkgs-525e397f643749336c352722c3ea092babf50716.tar.bz2 nixpkgs-525e397f643749336c352722c3ea092babf50716.tar.lz nixpkgs-525e397f643749336c352722c3ea092babf50716.tar.xz nixpkgs-525e397f643749336c352722c3ea092babf50716.tar.zst nixpkgs-525e397f643749336c352722c3ea092babf50716.zip | |
live555: broken on aarch64
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/live555/default.nix | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 2f0ce0afb15..cbf3c4917c3 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -38,16 +38,17 @@ stdenv.mkDerivation rec { systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive libkate libtiger libv4l samba liboggz libass libdvbpsi libva 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 - ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] + ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 + ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; 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 # set the path to the compiler diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 6d62daadaa6..527a0d0705d 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { homepage = http://www.live555.com/liveMedia/; license = licenses.lgpl21Plus; platforms = platforms.unix; + broken = stdenv.hostPlatform.isAarch64; }; } |