Unverified Commit 7d2381f7 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #265395 from reckenrode/arrow-cpp-fix 

arrow-cpp: fix crash in tests on x86_64-darwin
parents d0a60851 b5979d3f

pkgs/development/libraries/abseil-cpp/202103.nix

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec { 
      url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch";

      sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc=";

    })

  ] ++ lib.optionals stdenv.isDarwin [

    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages

    # that require a different SDK other than the default one.

    ./cmake-core-foundation.patch

  ];



  cmakeFlags = [

pkgs/development/libraries/abseil-cpp/202111.nix

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk=";

  };



  patches = lib.optionals stdenv.isDarwin [

    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages

    # that require a different SDK other than the default one.

    ./cmake-core-foundation.patch

  ];



  cmakeFlags = [

    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"

  ] ++ lib.optionals (cxxStandard != null) [

pkgs/development/libraries/abseil-cpp/202206.nix

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec { 
    hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8=";

  };



  patches = lib.optionals stdenv.isDarwin [

    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages

    # that require a different SDK other than the default one.

    ./cmake-core-foundation.patch

  ];



  cmakeFlags = [

    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"

  ] ++ lib.optionals (cxxStandard != null) [

pkgs/development/libraries/abseil-cpp/202301.nix

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI=";

  };



  patches = lib.optionals stdenv.isDarwin [

    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages

    # that require a different SDK other than the default one.

    ./cmake-core-foundation.patch

  ];



  cmakeFlags = [

    "-DABSL_BUILD_TEST_HELPERS=ON"

    "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"

pkgs/development/libraries/abseil-cpp/202308.nix

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k=";

  };



  patches = lib.optionals stdenv.isDarwin [

    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages

    # that require a different SDK other than the default one.

    ./cmake-core-foundation.patch

  ];



  cmakeFlags = [

    "-DABSL_BUILD_TEST_HELPERS=ON"

    "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"