summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-07-02 23:04:52 +0300
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-07-13 08:29:05 +0200
commit2ad7463144b4917db34aac7ec7bfaf78e06c4391 (patch)
tree6610fcfa460fc529b1111fe0e74f3c24bdb67e15 /pkgs/tools/misc
parent335cc971be64bc85f5977d794685641b69f88e68 (diff)
downloadnixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.tar
nixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.tar.gz
nixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.tar.bz2
nixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.tar.lz
nixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.tar.xz
nixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.tar.zst
nixlib-2ad7463144b4917db34aac7ec7bfaf78e06c4391.zip
pythonPackages.magic: Fix loading libmagic.so
Even with the previous `python.patch` file around, libmagic.so isn't
found. Instead patch it to use an absolute path, using a similar
approach that is used by the `python_magic` package (which is another
libmagic python wrapper library as well).
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/file/python.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
deleted file mode 100644
index 8ecbc9a81fdc..000000000000
--- a/pkgs/tools/misc/file/python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
-+++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
-@@ -13,7 +13,7 @@
-     Loads the shared library through ctypes and returns a library
-     L{ctypes.CDLL} instance 
-     """
--    return ctypes.cdll.LoadLibrary(find_library('magic'))
-+    return ctypes.CDLL('libmagic.so')
- 
- _libraries = {}
- _libraries['magic'] = _init()