gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #334401 from dotlambda/pymol

Browse Source 
pymol: use python311Packages
This commit is contained in:
OTABI Tomoya
2024-08-14 15:45:47 +09:00
committed by GitHub
parent 7ae88ec0f3 38688506b8
commit d356532512
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/chemistry/pymol/default.nix
+3 -4
View File
@@ -2,7 +2,6 @@
, lib
, fetchFromGitHub
, makeDesktopItem
, python3
, python3Packages
, netcdf
, glew
@@ -50,7 +49,7 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace-fail "self.install_libbase" '"${placeholder "out"}/${python3.sitePackages}"'
--replace-fail "self.install_libbase" '"${placeholder "out"}/${python3Packages.python.sitePackages}"'
'';
build-system = [
@@ -63,10 +62,10 @@ python3Packages.buildPythonApplication rec {
postInstall = with python3Packages; ''
wrapProgram $out/bin/pymol \
--prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]}
--prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3Packages.python.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]}
mkdir -p "$out/share/icons/"
ln -s $out/${python3.sitePackages}/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg"
ln -s $out/${python3Packages.python.sitePackages}/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg"
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
cp -r "${desktopItem}/share/applications/" "$out/share/"
'';
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -36819,7 +36819,9 @@ with pkgs;
pdb2pqr = with python3Packages; toPythonApplication pdb2pqr;
pymol = callPackage ../applications/science/chemistry/pymol { };
pymol = callPackage ../applications/science/chemistry/pymol {
python3Packages = python311Packages;
};
quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso {
hdf5 = hdf5-fortran;