From 8411d7c52033d90405282f2841d841c7cc3a85d8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 May 2024 21:15:40 -0300 Subject: [PATCH 1/2] live555: reorder --- pkgs/by-name/li/live555/package.nix | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index e8fb1309844b..9b58cc2f0bf5 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -38,11 +38,24 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "C_COMPILER=$(CC)" + "CPLUSPLUS_COMPILER=$(CXX)" + "LIBRARY_LINK=$(AR) cr " + "LINK=$(CXX) -o " + ]; + + # Since NIX_CFLAGS_COMPILE affects both C and C++ toolchains, we set CXXFLAGS + # directly + env.CXXFLAGS = "-std=c++20"; + strictDeps = true; - # Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we - # set CXXFLAGS directly - env.CXXFLAGS = "-std=c++20"; + enableParallelBuilding = true; + + # required for whitespaces in makeFlags + __structuredAttrs = true; postPatch = '' substituteInPlace config.macosx-catalina \ @@ -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; From ecee36b4c244a69bed8afcfc978e3d654f9d2bf1 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 May 2024 21:15:04 -0300 Subject: [PATCH 2/2] live555: 2024.05.05 -> 2024.05.15 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 9b58cc2f0bf5..2a49aaa0db4d 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.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 = [