Unverified Commit 1c39ed24 authored by Azat Bahawi's avatar Azat Bahawi Committed by GitHub
Browse files

Merge pull request #330373 from tobim/pkgs/re2-2024-07 

re2: fix static, always build tests
parents d808a7b1 ac86e53e

pkgs/development/libraries/re2/default.nix

+8 −9
Original line number Diff line number Diff line
@@ -36,20 +36,19 @@ stdenv.mkDerivation (finalAttrs: { 
    ninja

  ];



  buildInputs = lib.optionals finalAttrs.doCheck [

  buildInputs = [

    gbenchmark

    gtest

  ];



  propagatedBuildInputs = [

    abseil-cpp

    icu

  ];

  propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ];



  cmakeFlags = [

    (lib.cmakeBool "RE2_BUILD_TESTING" finalAttrs.doCheck)

  cmakeFlags =

    [ (lib.cmakeBool "RE2_BUILD_TESTING" true) ]

    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [

      (lib.cmakeBool "RE2_USE_ICU" true)

  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) (lib.cmakeBool "BUILD_SHARED_LIBS" true);

      (lib.cmakeBool "BUILD_SHARED_LIBS" true)

    ];



  doCheck = true;