Skip to content

Commit ee4dd4e

Browse files
authored
python3Packages.dm-tree: cleanup (#393216)
2 parents 6a6c6f2 + b375f56 commit ee4dd4e

File tree

3 files changed

+5
-23
lines changed

3 files changed

+5
-23
lines changed

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ buildPythonPackage rec {
3030
tag = version;
3131
hash = "sha256-cHuaqA89r90TCPVHNP7B1cfK+WxqmfTXndJ/dRdmM24=";
3232
};
33-
3433
# Allows to forward cmake args through the conventional `cmakeFlags`
3534
postPatch = ''
3635
substituteInPlace setup.py \
3736
--replace-fail \
3837
"cmake_args = [" \
3938
'cmake_args = [ *os.environ.get("cmakeFlags", "").split(),'
39+
substituteInPlace tree/CMakeLists.txt \
40+
--replace-fail \
41+
"CMAKE_CXX_STANDARD 14" \
42+
"CMAKE_CXX_STANDARD 17"
4043
'';
4144
cmakeFlags = [
4245
(lib.cmakeBool "USE_SYSTEM_ABSEIL" true)

pkgs/top-level/python-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3945,7 +3945,7 @@ self: super: with self; {
39453945
dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };
39463946

39473947
dm-tree = callPackage ../development/python-modules/dm-tree {
3948-
abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; };
3948+
inherit (pkgs) abseil-cpp;
39493949
};
39503950

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

0 commit comments

Comments
 (0)