Skip to content

Commit

Permalink
Merge pull request #307605 from atorres1985-contrib/live555
Browse files Browse the repository at this point in the history
live555: 2024.04.14 -> 2024.04.19
  • Loading branch information
pbsds committed May 1, 2024
2 parents 211cb10 + 01429c0 commit 3e49b0b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pkgs/by-name/li/live555/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "live555";
version = "2024.04.14";
version = "2024.04.19";

src = fetchurl {
urls = [
Expand All @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://download.videolan.org/contrib/live555/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 = [
Expand Down Expand Up @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
config.linux
''
# condition from icu/base.nix
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc"
|| stdenv.hostPlatform.libc == "musl") ''
+ lib.optionalString (lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ]) ''
substituteInPlace liveMedia/include/Locale.hh \
--replace '<xlocale.h>' '<locale.h>'
'';
Expand Down

0 comments on commit 3e49b0b

Please sign in to comment.