Commit 8411d7c5 authored by Anderson Torres's avatar Anderson Torres
Browse files

live555: reorder

parent bfb7a882

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

+16 −16
Original line number Diff line number Diff line
@@ -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;