From c972f01e2d670f9483a980312c0e12b81094cebb Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Fri, 2 Jun 2017 21:55:16 +0100
Subject: pymol: set PYTHONPATH in a future way

---
 pkgs/applications/science/chemistry/pymol/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications/science/chemistry')

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 200d00395e2a..ed208014f7d9 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, makeDesktopItem, python3Packages, glew, freeglut, libpng, libxml2, tk, freetype }:
+{ stdenv, fetchurl, makeDesktopItem
+, python3, python3Packages
+, glew, freeglut, libpng, libxml2, tk, freetype }:
+
+
+with stdenv.lib;
 
 let
   pname = "pymol";
@@ -33,13 +38,12 @@ python3Packages.buildPythonApplication {
     runHook postInstall
   '';
 
-  postInstall = ''
+  postInstall = with python3Packages; ''
     wrapProgram $out/bin/pymol \
-      --prefix PYTHONPATH : ${python3Packages.Pmw}/lib/python3.6/site-packages \
-      --prefix PYTHONPATH : ${python3Packages.tkinter}/lib/python3.6/site-packages
+      --prefix PYTHONPATH : ${makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = description;
     homepage = "https://www.pymol.org/";
     license = licenses.psfl;
-- 
cgit 1.4.1