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

Merge pull request #50612 from c0bw3b/pkg/live555

Browse Source 
live555: 2018.02.28 -> 2018.10.17
This commit is contained in:
Renaud 2018-11-18 19:15:55 +01:00 committed by GitHub
commit 0a870bfbd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 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

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

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