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 4dd5d8bcd26..527a0d0705d 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, lib, darwin }: # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD -let - version = "2018.02.28"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "live555-${version}"; + version = "2018.10.17"; src = fetchurl { # the upstream doesn't provide a stable URL url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; - sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d"; + sha256 = "1s69ipvdc6ldscp0cr1zpsll8xc3qcagr95nl84x7b1rbg4xjs3w"; }; postPatch = '' @@ -23,28 +21,39 @@ stdenv.mkDerivation { ''; configurePhase = '' + runHook preConfigure + ./genMakefiles ${{ x86_64-darwin = "macosx"; i686-linux = "linux"; x86_64-linux = "linux-64bit"; aarch64-linux = "linux-64bit"; }.${stdenv.hostPlatform.system}} + + runHook postConfigure ''; installPhase = '' + runHook preInstall + for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do install -dm755 $out/{bin,lib,include/$dir} install -m644 $dir/*.a "$out/lib" install -m644 $dir/include/*.h* "$out/include/$dir" done + + runHook postInstall ''; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + enableParallelBuilding = true; + meta = with lib; { description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; homepage = http://www.live555.com/liveMedia/; license = licenses.lgpl21Plus; platforms = platforms.unix; + broken = stdenv.hostPlatform.isAarch64; }; }