Unverified Commit bdaf0a39 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #211301 from ziguana/master 

python3Packages.dm-tree: Fix build
parents 2ebcdec8 938b7ae1

pkgs/development/python-modules/dm-env/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -4,15 +4,17 @@ 
, dm-tree

, numpy

, absl-py

, nose }:

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "dm-env";

  version = "1.6";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    sha256 = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94=";

    hash = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94=";

  };



  buildInputs = [
@@ -22,7 +24,7 @@ buildPythonPackage rec { 
  ];



  checkInputs = [

    nose

    pytestCheckHook

  ];



  pythonImportsCheck = [

pkgs/development/python-modules/dm-tree/cmake.patch

+8 −8
Original line number Diff line number Diff line 
diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt

index 8f9946c..b9d6e9b 100644

index 4fd1b1a..f0d072b 100644

--- a/tree/CMakeLists.txt

+++ b/tree/CMakeLists.txt

@@ -50,70 +50,80 @@ if(APPLE)

@@ -50,70 +50,79 @@ if(APPLE)

   set (CMAKE_FIND_FRAMEWORK LAST)

 endif()

 

-# Fetch pybind to be able to use pybind11_add_module symbol.

-set(PYBIND_VER v2.6.2)

-set(PYBIND_VER v2.10.1)

-include(FetchContent)

-FetchContent_Declare(

-  pybind11
@@ -42,7 +42,7 @@ index 8f9946c..b9d6e9b 100644 
+

+if (NOT pybind11_FOUND)

+  # Fetch pybind to be able to use pybind11_add_module symbol.

+  set(PYBIND_VER v2.6.2)

+  set(PYBIND_VER v2.10.1)

+  include(FetchContent)

+  FetchContent_Declare(

+    pybind11
@@ -69,10 +69,7 @@ index 8f9946c..b9d6e9b 100644 
 # Define pybind11 tree module.

 pybind11_add_module(_tree tree.h tree.cc)

-add_dependencies(_tree abseil-cpp)

 

-if (WIN32 OR MSVC)

-    set(ABSEIL_LIB_PREF "absl")

-    set(LIB_SUFF "lib")

-

+find_package(absl)

+

+if (NOT absl_FOUND)
@@ -115,6 +112,9 @@ index 8f9946c..b9d6e9b 100644 
+      set(LIB_SUFF "a")

+  endif()

+

-if (WIN32 OR MSVC)

-    set(ABSEIL_LIB_PREF "absl")

-    set(LIB_SUFF "lib")

+  # Link abseil static libs.

+  # We don't use find_library here to force cmake to build abseil before linking.

+  set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)