Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e1bd04a3f4fa
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 734cc38c75c1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 18, 2018

  1. live555: 2018.02.28 -> 2018.10.17 

    (cherry picked from commit fb81d62)
    @peterhoeg @c0bw3b
    peterhoeg authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    46d5ce2 View commit details

  2. live555: broken on aarch64 

    (cherry picked from commit 525e397)
    @c0bw3b
    c0bw3b committed Nov 18, 2018
    Copy the full SHA
    d03b29f View commit details

  3. Merge pull request #50613 from c0bw3b/sec/1809/live555 

    [18.09] live555: 2018.02.28 -> 2018.10.17
    @c0bw3b
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    734cc38 View commit details
Showing with 18 additions and 8 deletions.
  1. +4 −3 pkgs/applications/video/vlc/default.nix
  2. +14 −5 pkgs/development/libraries/live555/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/video/vlc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,16 +37,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 ];

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
19 changes: 14 additions & 5 deletions pkgs/development/libraries/live555/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}