diff options
| author | Chris Ostrouchov <chris.ostrouchov@gmail.com> | 2018-10-15 17:13:23 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 07:46:56 +0200 |
| commit | a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa (patch) | |
| tree | da041f60cf546d226dd0bcc95471fc32ad2a4043 | |
| parent | 93e026ce04df3b495ba70bcf7747a3533af5d5d9 (diff) | |
| download | nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.tar nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.tar.gz nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.tar.bz2 nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.tar.lz nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.tar.xz nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.tar.zst nixlib-a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa.zip | |
pythonPackages.magic: refactor move to python-modules
| -rw-r--r-- | pkgs/development/python-modules/magic/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 22 |
2 files changed, 29 insertions, 21 deletions
diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix new file mode 100644 index 000000000000..41c932ed1117 --- /dev/null +++ b/pkgs/development/python-modules/magic/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, pkgs +}: + +buildPythonPackage rec { + name = "${pkgs.file.name}"; + + src = pkgs.file.src; + + patchPhase = '' + substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + buildInputs = [ pkgs.file ]; + + preConfigure = "cd python"; + + # No test suite + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python wrapper around libmagic"; + homepage = http://www.darwinsys.com/file/; + license = licenses.lgpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c259ed984c55..85082f28490e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5771,27 +5771,7 @@ in { python_magic = callPackage ../development/python-modules/python-magic { }; - magic = buildPythonPackage rec { - name = "${pkgs.file.name}"; - - src = pkgs.file.src; - - patchPhase = '' - substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - - buildInputs = with self; [ pkgs.file ]; - - preConfigure = "cd python"; - - # No test suite - doCheck = false; - - meta = { - description = "A Python wrapper around libmagic"; - homepage = http://www.darwinsys.com/file/; - }; - }; + magic = callPackage ../development/python-modules/magic { }; m2crypto = buildPythonPackage rec { version = "0.24.0"; |