Unverified Commit f93401ee authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

python3Packages.importmagic: fix build (#356666)

parents f58d0771 6353656e
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -13,19 +13,24 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
    sha256 = "3f7757a5b74c9a291e20e12023bb3bf71bc2fa3adfb15a08570648ab83eaf8d8";
    hash = "sha256-P3dXpbdMmikeIOEgI7s79xvC+jrfsVoIVwZIq4Pq+Ng=";
  };

  patches = [
    # https://github.com/alecthomas/importmagic/issues/67
    ./python-312.patch
  ];

  propagatedBuildInputs = [ six ];

  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "importmagic" ];

  meta = with lib; {
  meta = {
    description = "Python Import Magic - automagically add, remove and manage imports";
    homepage = "https://github.com/alecthomas/importmagic";
    license = licenses.bsd0;
    maintainers = with maintainers; [ onny ];
    license = lib.licenses.bsd0;
    maintainers = with lib.maintainers; [ onny ];
  };
}
+24 −0
Original line number Diff line number Diff line
--- a/importmagic/index.py
+++ b/importmagic/index.py
@@ -8,18 +8,14 @@
 import logging
 import re
 from contextlib import contextmanager
-from distutils import sysconfig
+import sysconfig
 
 from importmagic.util import parse_ast
 
 
 LIB_LOCATIONS = sorted(set((
-    (sysconfig.get_python_lib(standard_lib=True), 'S'),
-    (sysconfig.get_python_lib(plat_specific=True), '3'),
-    (sysconfig.get_python_lib(standard_lib=True, prefix=sys.prefix), 'S'),
-    (sysconfig.get_python_lib(plat_specific=True, prefix=sys.prefix), '3'),
-    (sysconfig.get_python_lib(standard_lib=True, prefix='/usr/local'), 'S'),
-    (sysconfig.get_python_lib(plat_specific=True, prefix='/usr/local'), '3'),
+    (sysconfig.get_path('stdlib'), 'S'),
+    (sysconfig.get_path('platlib'), '3'),
 )), key=lambda l: -len(l[0]))
 
 # Regex matching modules that we never attempt to index.