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;