* [bug#64447] [PATCH] gnu: python-pymol: Fix launch script.
@ 2023-07-03 21:31 David Elsing
2023-07-26 14:16 ` bug#64447: " Andreas Enge
0 siblings, 1 reply; 2+ messages in thread
From: David Elsing @ 2023-07-03 21:31 UTC (permalink / raw)
To: 64447; +Cc: David Elsing, andreas, efraim, bavier
* gnu/packages/chemistry.scm (python-pymol)[#:phases]: Add ‘disable-unchroot’.
[native-inputs]: Remove python-setuptools.
---
gnu/packages/chemistry.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index cddccf8aea..1f8b051a85 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2022 David Elsing <david.elsing@posteo.net>
+;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -554,6 +554,12 @@ (define-public python-pymol
(assoc-ref inputs "libxml2")
"/include/libxml2:"
(getenv "CPLUS_INCLUDE_PATH")))))
+ ;; Prevent deleting the leading / in the __init__.py path in the
+ ;; launch script.
+ (add-after 'unpack 'disable-unchroot
+ (lambda _
+ (substitute* "setup.py"
+ (("self\\.unchroot") ""))))
;; The setup.py script does not support one of the Python build
;; system's default flags, "--single-version-externally-managed".
(replace 'install
@@ -572,8 +578,7 @@ (define-public python-pymol
python-pyqt
glm
netcdf))
- (native-inputs
- (list catch2 python-setuptools))
+ (native-inputs (list catch2))
(home-page "https://pymol.org")
(synopsis "Molecular visualization system")
(description "PyMOL is a capable molecular viewer and renderer. It can be
--
2.40.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#64447: [PATCH] gnu: python-pymol: Fix launch script.
2023-07-03 21:31 [bug#64447] [PATCH] gnu: python-pymol: Fix launch script David Elsing
@ 2023-07-26 14:16 ` Andreas Enge
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Enge @ 2023-07-26 14:16 UTC (permalink / raw)
To: David Elsing; +Cc: 64447-done, efraim, bavier
Applied, thanks!
Andreas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-26 14:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-03 21:31 [bug#64447] [PATCH] gnu: python-pymol: Fix launch script David Elsing
2023-07-26 14:16 ` bug#64447: " Andreas Enge
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).