about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt <pbsds@hotmail.com>2024-04-30 23:24:24 +0200
committerGitHub <noreply@github.com>2024-04-30 23:24:24 +0200
commit9027d4164feadd81e550ea802526afc7e46fbcfb (patch)
tree45daf1b2b9aa00167d0fc14d9c522858adb01dbc
parent4e1c957aae9476ef491ff9c96538baed5a603c63 (diff)
parent495d56cd3795b7ce62150b44dafef7d19b14dd63 (diff)
Merge pull request #293621 from luispedro/mahotas_remove_freeimage
python311Packages.mahotas: remove freeimage dependency
-rw-r--r--pkgs/development/python-modules/mahotas/default.nix8
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
index 6926cc0e6958f..e5ad5a283db7a 100644
--- a/pkgs/development/python-modules/mahotas/default.nix
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -6,7 +6,6 @@
 , numpy
 , pytestCheckHook
 , imread
-, freeimage
 , lib
 , stdenv
 }:
@@ -24,7 +23,6 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    freeimage
     imread
     numpy
     pillow
@@ -33,11 +31,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  postPatch = ''
-    substituteInPlace mahotas/io/freeimage.py \
-      --replace "ctypes.util.find_library('freeimage')" 'True' \
-      --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")'
-  '';
 
   # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std'
   env = lib.optionalAttrs stdenv.cc.isClang {
@@ -59,7 +52,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [
     "mahotas"
-    "mahotas.freeimage"
   ];
 
   disabled = stdenv.isi686; # Failing tests