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

Merge pull request #307605 from atorres1985-contrib/live555

Browse source 
live555: 2024.04.14 -> 2024.04.19
This commit is contained in:
Peder Bergebakken Sundt 2024-05-01 16:13:20 +02:00 committed by GitHub
commit 3e49b0ba08
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/by-name/li/live555/package.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "live555"; pname = "live555";
version = "2024.04.14"; version = "2024.04.19";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
]; ];
hash = "sha256-mR5rKGKtTwMq3p+xAAGdo0DNNnIe4KHladLPlnhVhNY="; hash = "sha256-5sLr/sZ3LB83CEJx5OUjarx/Dh/ESJ+YaXY0QCAN3MI=";
}; };
patches = [ patches = [
@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
config.linux config.linux
'' ''
# condition from icu/base.nix # condition from icu/base.nix
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc" + lib.optionalString (lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ]) ''
|| stdenv.hostPlatform.libc == "musl") ''
substituteInPlace liveMedia/include/Locale.hh \ substituteInPlace liveMedia/include/Locale.hh \
--replace '<xlocale.h>' '<locale.h>' --replace '<xlocale.h>' '<locale.h>'
''; '';