diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/python-modules/scikit-build/python312-compatibility.patch | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/scikit-build/python312-compatibility.patch')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/scikit-build/python312-compatibility.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/scikit-build/python312-compatibility.patch b/nixpkgs/pkgs/development/python-modules/scikit-build/python312-compatibility.patch new file mode 100644 index 000000000000..8e86eccf010b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/scikit-build/python312-compatibility.patch @@ -0,0 +1,40 @@ +diff --git a/skbuild/resources/cmake/FindPythonExtensions.cmake b/skbuild/resources/cmake/FindPythonExtensions.cmake +index 59b30c2..62298d5 100644 +--- a/skbuild/resources/cmake/FindPythonExtensions.cmake ++++ b/skbuild/resources/cmake/FindPythonExtensions.cmake +@@ -254,19 +254,23 @@ endif() + include(targetLinkLibrariesWithDynamicLookup) + + set(_command " +-import distutils.sysconfig ++import sys ++ ++if sys.version_info >= (3,10): ++ import sysconfig ++else: ++ from distutils import sysconfig + import itertools + import os + import os.path + import site +-import sys + + result = None + rel_result = None + candidate_lists = [] + + try: +- candidate_lists.append((distutils.sysconfig.get_python_lib(),)) ++ candidate_lists.append((sysconfig.get_python_lib(),)) + except AttributeError: pass + + try: +@@ -293,7 +297,7 @@ sys.stdout.write(\";\".join(( + sys.prefix, + result, + rel_result, +- distutils.sysconfig.get_config_var('EXT_SUFFIX') ++ sysconfig.get_config_var('EXT_SUFFIX') + ))) + ") + |