Unverified Commit ee4dd4eb authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.dm-tree: cleanup (#393216)

parents 6a6c6f21 b375f56b

pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt

index 4fd1b1a..2d1d9d3 100644

--- a/tree/CMakeLists.txt

+++ b/tree/CMakeLists.txt

@@ -40,16 +40,6 @@ if (NOT (WIN32 OR MSVC))

   endif()

 endif()

 

-if(APPLE)

-  # On MacOS:

-  #   -undefined dynamic_lookup is necessary for pybind11 linking

-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything -w -undefined dynamic_lookup")

-

-  # On MacOS, we need this so that CMake will use the right Python if the user

-  # has a virtual environment active

-  set (CMAKE_FIND_FRAMEWORK LAST)

-endif()

-

 # Fetch pybind to be able to use pybind11_add_module symbol.

 set(PYBIND_VER v2.10.1)

 include(FetchContent)

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

+4 −1
Original line number Diff line number Diff line
@@ -30,13 +30,16 @@ buildPythonPackage rec { 
    tag = version;

    hash = "sha256-cHuaqA89r90TCPVHNP7B1cfK+WxqmfTXndJ/dRdmM24=";

  };



  # Allows to forward cmake args through the conventional `cmakeFlags`

  postPatch = ''

    substituteInPlace setup.py \

      --replace-fail \

        "cmake_args = [" \

        'cmake_args = [ *os.environ.get("cmakeFlags", "").split(),'

    substituteInPlace tree/CMakeLists.txt \

      --replace-fail \

        "CMAKE_CXX_STANDARD 14" \

        "CMAKE_CXX_STANDARD 17"

  '';

  cmakeFlags = [

    (lib.cmakeBool "USE_SYSTEM_ABSEIL" true)

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -3945,7 +3945,7 @@ self: super: with self; { 
  dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };















  dm-tree = callPackage ../development/python-modules/dm-tree {













    abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; };













    inherit (pkgs) abseil-cpp;















  };





























  dmenu-python = callPackage ../development/python-modules/dmenu { };