From 3016f1f21a2354b9df609b0e76246d1f3b9ce209 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 22 Jan 2021 10:33:34 -0500 Subject: 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 aaf70967ab..2f6106bd90 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Christopher Lemmer Webber ;;; Copyright © 2020 B. Wilson +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; 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 -- cgit v1.2.3