Merge #314436: live555: 2024.05.05 → 2024.05.15 (f772b7cb) · Commits · nix / nixpkgs

pkgs/by-name/li/live555/package.nix

+18 −18

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "live555";
		version = "2024.05.05";
		version = "2024.05.15";

		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-jGT1jg5pa4bwIcxUy7/svIhU2HCxx2TNMkWvBfN33nM=";
		hash = "sha256-Mgkf5XiFBEEDTTx+YlV12wE4zpmPPqaUPv9KcEK38D0=";
		};

		patches = [
		@@ -38,12 +38,25 @@ stdenv.mkDerivation (finalAttrs: {
		openssl
		];

		strictDeps = true;
		makeFlags = [
		"PREFIX=${placeholder "out"}"
		"C_COMPILER=$(CC)"
		"CPLUSPLUS_COMPILER=$(CXX)"
		"LIBRARY_LINK=$(AR) cr "
		"LINK=$(CXX) -o "
		];

		# Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we
		# set CXXFLAGS directly
		# Since NIX_CFLAGS_COMPILE affects both C and C++ toolchains, we set CXXFLAGS
		# directly
		env.CXXFLAGS = "-std=c++20";

		strictDeps = true;

		enableParallelBuilding = true;

		# required for whitespaces in makeFlags
		__structuredAttrs = true;

		postPatch = ''
		substituteInPlace config.macosx-catalina \
		--replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
		@@ -75,19 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
		runHook postConfigure
		'';

		makeFlags = [
		"PREFIX=${placeholder "out"}"
		"C_COMPILER=$(CC)"
		"CPLUSPLUS_COMPILER=$(CXX)"
		"LIBRARY_LINK=$(AR) cr "
		"LINK=$(CXX) -o "
		];

		# required for whitespaces in makeFlags
		__structuredAttrs = true;

		enableParallelBuilding = true;

		passthru.tests = {
		# Downstream dependency
		inherit vlc;