Unverified Commit 3e49b0ba authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #307605 from atorres1985-contrib/live555

live555: 2024.04.14 -> 2024.04.19
parents 211cb102 01429c02
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -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>'
  '';