Merge pull request #192660 from samlich/master

pymol: use Qt instead of Tk; fixes #192555

authored by

Dmitry Kalinkin and committed by
GitHub
846f382e f8943b8c

+8 -6
+8 -6
pkgs/applications/science/chemistry/pymol/default.nix
··· 7 , netcdf 8 , glew 9 , glm 10 - , freeglut 11 , libpng 12 , libxml2 13 - , tk 14 , freetype 15 , msgpack 16 }: 17 let 18 pname = "pymol"; ··· 47 sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; 48 }; 49 50 - buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack netcdf ]; 51 NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; 52 hardeningDisable = [ "format" ]; 53 - 54 - setupPyBuildFlags = [ "--glut" ]; 55 56 installPhase = '' 57 python setup.py install --home="$out" ··· 60 61 postInstall = with python3Packages; '' 62 wrapProgram $out/bin/pymol \ 63 - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]} 64 65 mkdir -p "$out/share/icons/" 66 ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" 67 cp -r "${desktopItem}/share/applications/" "$out/share/" 68 ''; 69 70 meta = with lib; {
··· 7 , netcdf 8 , glew 9 , glm 10 , libpng 11 , libxml2 12 , freetype 13 , msgpack 14 + , qt5 15 }: 16 let 17 pname = "pymol"; ··· 46 sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; 47 }; 48 49 + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; 50 + buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; 51 NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; 52 hardeningDisable = [ "format" ]; 53 54 installPhase = '' 55 python setup.py install --home="$out" ··· 58 59 postInstall = with python3Packages; '' 60 wrapProgram $out/bin/pymol \ 61 + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]} 62 63 mkdir -p "$out/share/icons/" 64 ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" 65 cp -r "${desktopItem}/share/applications/" "$out/share/" 66 + ''; 67 + 68 + preFixup = '' 69 + wrapQtApp "$out/bin/pymol" 70 ''; 71 72 meta = with lib; {