diff options
Diffstat (limited to 'pkgs/by-name/li/live555/package.nix')
| -rw-r--r-- | pkgs/by-name/li/live555/package.nix | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 2c9f13520eb7f..2a49aaa0db4dc 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.19"; + 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-5sLr/sZ3LB83CEJx5OUjarx/Dh/ESJ+YaXY0QCAN3MI="; + 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; |