diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-03-07 01:09:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 01:09:31 +0100 |
| commit | 1941313b6cbee671a8df964ab1ab2505e330f2fa (patch) | |
| tree | f48fe5f0289cf099b11b0affdd8dcd5b8897c2cb /pkgs/development/python-modules/python-magic/libmagic-path.patch | |
| parent | 8ae8348b9dcc0d93a7cb7bbdb16be5fd6fd966f8 (diff) | |
| parent | 6c3b5c1942fe539226fad6bea4af9f1b2c275e45 (diff) | |
Merge pull request #115260 from dotlambda/python-magic-fix
pythonPackages.python_magic: fix build and run tests
Diffstat (limited to 'pkgs/development/python-modules/python-magic/libmagic-path.patch')
| -rw-r--r-- | pkgs/development/python-modules/python-magic/libmagic-path.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/python-magic/libmagic-path.patch b/pkgs/development/python-modules/python-magic/libmagic-path.patch new file mode 100644 index 000000000000..5a1dbec7d51b --- /dev/null +++ b/pkgs/development/python-modules/python-magic/libmagic-path.patch @@ -0,0 +1,17 @@ +diff --git a/magic/loader.py b/magic/loader.py +index 6b2bfcb..69778af 100644 +--- a/magic/loader.py ++++ b/magic/loader.py +@@ -5,11 +5,7 @@ import glob + def load_lib(): + libmagic = None + # Let's try to find magic or magic1 +- dll = ctypes.util.find_library('magic') \ +- or ctypes.util.find_library('magic1') \ +- or ctypes.util.find_library('cygmagic-1') \ +- or ctypes.util.find_library('libmagic-1') \ +- or ctypes.util.find_library('msys-magic-1') # for MSYS2 ++ dll = '@libmagic@' + + # necessary because find_library returns None if it doesn't find the library + if dll: |