lol

pymol: fix build

+24 -2
+24 -2
pkgs/by-name/py/pymol/package.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchFromGitHub, 5 + fetchpatch, 5 6 makeDesktopItem, 6 7 cmake, 7 8 python3Packages, ··· 57 58 58 59 # A script is already created by the `[project.scripts]` directive 59 60 # in `pyproject.toml`. 60 - patches = [ ./script-already-exists.patch ]; 61 + patches = [ 62 + ./script-already-exists.patch 63 + 64 + # Fix python3.13 and numpy 2 compatibility 65 + (fetchpatch { 66 + url="https://github.com/schrodinger/pymol-open-source/commit/fef4a026425d195185e84d46ab88b2bbd6d96cf8.patch"; 67 + hash = "sha256-F/5UcYwgHgcMQ+zeigedc1rr3WkN9rhxAxH+gQfWKIY="; 68 + }) 69 + (fetchpatch { 70 + url="https://github.com/schrodinger/pymol-open-source/commit/97cc1797695ee0850621762491e93dc611b04165.patch"; 71 + hash = "sha256-H2PsRFn7brYTtLff/iMvJbZ+RZr7GYElMSINa4RDYdA="; 72 + }) 73 + # Fixes failing test testLoadPWG 74 + (fetchpatch { 75 + url="https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch"; 76 + hash = "sha256-dcYRzUhiaGlR3CjQ0BktA5L+8lFyVdw0+hIz3Li7gDQ="; 77 + }) 78 + ]; 61 79 62 80 postPatch = '' 63 81 substituteInPlace setup.py \ 64 82 --replace-fail "self.install_libbase" '"${placeholder "out"}/${python3Packages.python.sitePackages}"' 83 + 84 + substituteInPlace pyproject.toml \ 85 + --replace-fail '"cmake>=3.13.3",' "" 65 86 ''; 66 87 67 88 env.PREFIX_PATH = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${msgpack}"; ··· 74 95 ]; 75 96 76 97 buildInputs = [ 77 - python3Packages.numpy_1 98 + python3Packages.numpy 78 99 python3Packages.pyqt5 79 100 qt5.qtbase 80 101 glew ··· 115 136 python3Packages.msgpack 116 137 pillow 117 138 pytestCheckHook 139 + requests 118 140 ]; 119 141 120 142 # some tests hang for some reason