diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
| commit | 333f145d7604f07e3b2164b459b46e075fea81f4 (patch) | |
| tree | cb9bb91bafeafe64c97fa1054223c0d69cf18848 /pkgs/tools/misc/file | |
| parent | d253b3d875d2bae84afbc141754b286e18e2fb7d (diff) | |
| parent | 7e3c95a0b813394b1a41b73e078d3ffd9e951979 (diff) | |
| download | nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.gz nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.bz2 nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.lz nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.xz nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.zst nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc/file')
| -rw-r--r-- | pkgs/tools/misc/file/python.patch | 11 |
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 8ecbc9a81fd..00000000000 --- 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() |