Revert my previous 2 commits.

svn path=/nixpkgs/trunk/; revision=33951
This commit is contained in:
Rob Vermaas
2012-04-30 14:28:08 +00:00
parent 0362f55a22
commit 0823167b43
8 changed files with 4 additions and 651 deletions

View File

@@ -1,17 +0,0 @@
{stdenv, fetchurl, zlib}:
stdenv.mkDerivation rec {
name = "file-5.11";
buildInputs = [ zlib ];
src = fetchurl {
url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
};
meta = {
description = "A program that shows the type of files";
homepage = "http://darwinsys.com/file";
};
}

View File

@@ -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()