From b7c7550c439e682d555d38ad43b6c2a5686df1ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Dec 2010 19:19:56 +0000
Subject: [PATCH] * Replace the Python "magic" module with the (apparently)
 more   common one from the "file" package.

svn path=/nixpkgs/trunk/; revision=25322
---
 pkgs/tools/misc/file/default.nix   |  1 +
 pkgs/top-level/python-packages.nix | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 0349661833cb..b63619bc68ee 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,6 +2,7 @@
  
 stdenv.mkDerivation {
   name = "file-5.03";
+
   src = fetchurl {
     url = ftp://ftp.astron.com/pub/file/file-5.03.tar.gz;
     sha256 = "1fwmpplwc6h2g89ribq7w8x2np0yn5k7bw042815rv7jkrzv9nhy";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 346648c94d3b..966312712256 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -899,26 +899,22 @@ rec {
     };
   };
 
-  magic = buildPythonPackage rec {
-    name = "magic-0.3.1";
+  magic = pkgs.stdenv.mkDerivation rec {
+    name = "python-${pkgs.file.name}";
 
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz";
-      md5 = "397cff81d2502e81fd3830a61ca2ad2c";
-    };
+    src = pkgs.file.src;
 
-    preConfigure =
-      ''
-        # Ensure that the module can find libmagic by hard-coding the
-        # path to libmagic.so.  Maybe there is a nicer way.
-        substituteInPlace magic.py --replace \
-          "ctypes.util.find_library('magic')" \
-          "'${pkgs.file}/lib/libmagic.so'"
-      '';
+    buildInputs = [ python pkgs.file ];
+
+    configurePhase = "cd python";
+
+    buildPhase = "python setup.py build";
+
+    installPhase = "python setup.py install --prefix=$out";
 
     meta = {
       description = "A Python wrapper around libmagic";
-      homepage = https://github.com/ahupp/python-magic;
+      homepage = http://www.darwinsys.com/file/;
     };
   };