diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-01 18:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 18:01:22 +0000 |
| commit | 67f8ba4a30028468182899667963ca1ad074224d (patch) | |
| tree | a98f430f6bde3e78136139d40e784197ede6d45b /pkgs/by-name/li | |
| parent | 2b32fd65a31d54e9858734ad488df2a6434b4e8a (diff) | |
| parent | 6b39739b77c4ab3f39ee3276677ce94af3e2b39c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/by-name/li')
| -rw-r--r-- | pkgs/by-name/li/live555/package.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 1d8091bba7ab9..2c9f13520eb7f 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.04.14"; + version = "2024.04.19"; src = fetchurl { urls = [ @@ -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 = [ @@ -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>' ''; |