diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-05-01 16:13:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 16:13:20 +0200 |
| commit | 3e49b0ba0833f534fca9be19916895c0562db628 (patch) | |
| tree | dbd25f1dc6f8ce87719638f9a9ced9ea999c7888 /pkgs | |
| parent | 211cb102a2f64355396dfeae4e16ac9a37ba5b03 (diff) | |
| parent | 01429c022fcb611d72e74ee48f351fcdbea3e304 (diff) | |
Merge pull request #307605 from atorres1985-contrib/live555
live555: 2024.04.14 -> 2024.04.19
Diffstat (limited to 'pkgs')
| -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>' ''; |