diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-07 00:41:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 00:41:11 +0000 |
| commit | 5ae3107a2176cb91a20851828e0b7f5d81294d1a (patch) | |
| tree | 846909a583bbd1794d9b87bea117a7c1c693ed47 /pkgs/development/python-modules/python-magic/libmagic-path.patch | |
| parent | 909c7c15d573bb66d94a0935da6858a0a282a48a (diff) | |
| parent | b20e5c31f61a0237227d2531408e89757b1f5ed9 (diff) | |
Merge master into staging-next
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: |