cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #177909 from misuzu/live555-update

Browse source 
live555: 2022.02.07 -> 2022.06.16
This commit is contained in:
Anderson Torres 2022-06-16 19:46:15 -03:00 committed by GitHub
commit fedfcd6d24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/development/libraries/live555/default.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "live555"; pname = "live555";
version = "2022.02.07"; version = "2022.06.16";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
]; ];
sha256 = "sha256-bwwfinHOtQa8v5abArSww2l7ThXa623LqYcsh0XOksY="; sha256 = "sha256-84OUQw++RNqH3sAY4S6yXRJXZY+5T0VdTIUqELuVdV0=";
}; };
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
@ -42,27 +42,21 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
./genMakefiles ${{ ./genMakefiles ${
x86_64-darwin = "macosx-catalina"; if stdenv.isLinux then
i686-linux = "linux"; "linux"
x86_64-linux = "linux-64bit"; else if stdenv.isDarwin then
aarch64-linux = "linux-64bit"; "macosx-catalina"
}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}")} else
throw "Unsupported platform ${stdenv.hostPlatform.system}"}
runHook postConfigure runHook postConfigure
''; '';
installPhase = '' makeFlags = [
runHook preInstall "DESTDIR=${placeholder "out"}"
"PREFIX="
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
'';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -77,6 +71,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
}; };
} }