apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit 392a2bfd4e5ea1b7443f7b68d708b424f32cea10 Author: Maxim Cournoyer <[email protected]> AuthorDate: Fri Jan 22 10:33:34 2021 -0500 gnu: intel-xed: Adjust build phase. * gnu/packages/assembly.scm (intel-xed) [phases]: Delete trailing #t. {build}: Do not read PYTHONPATH from environment. --- gnu/packages/assembly.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index aaf7096..2f6106b 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Jakub Kądziołka <[email protected]> ;;; Copyright © 2020 Christopher Lemmer Webber <[email protected]> ;;; Copyright © 2020 B. Wilson <[email protected]> +;;; Copyright © 2021 Maxim Cournoyer <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -463,8 +464,7 @@ sets, both THUMB and ARM mode.") (replace 'build (lambda* (#:key inputs #:allow-other-keys) (let ((mbuild (assoc-ref inputs "mbuild"))) - (setenv "PYTHONPATH" (string-append - (getenv "PYTHONPATH") ":" mbuild)) + (setenv "PYTHONPATH" mbuild) (invoke "./mfile.py" (string-append "--build-dir=" build-dir) (string-append "--install-dir=" kit-dir) @@ -491,8 +491,7 @@ sets, both THUMB and ARM mode.") (copy-recursively (string-append kit-dir "/include") (string-append lib "/include")) (copy-recursively (string-append kit-dir "/lib") - (string-append lib "/lib")) - #t))))))) + (string-append lib "/lib"))))))))) (home-page "https://intelxed.github.io/";) (synopsis "Encoder and decoder for x86 (IA32 and Intel64) instructions") (description "The Intel X86 Encoder Decoder (XED) is a software library and
