From cbb9fab20f1c5b525d7587b65d7d6163bfe1a9a0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 23 Jan 2021 23:49:59 -0500 Subject: gnu: python-pynacl: Do not set PYTHONPATH. * gnu/packages/python-crypto.scm (python-pynacl): Delete trailing #t. [arguments]: Remove the '#:modules' argument. [phases]: Use %standard-phases. Do not set PYTHONPATH. --- gnu/packages/python-crypto.scm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1f491cc972..39b194b25e 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -789,31 +790,20 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.") (substitute* "setup.py" (("\"wheel\"") "")) ;; Remove bundled libsodium. - (delete-file-recursively "src/libsodium") - #t)) + (delete-file-recursively "src/libsodium"))) (sha256 (base32 "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal")))) (build-system python-build-system) (arguments - `(#:modules (,@%python-build-system-modules - (guix build utils) - (ice-9 ftw) - (srfi srfi-26)) - #:phases - (modify-phases (@ (guix build python-build-system) %standard-phases) + `(#:phases + (modify-phases %standard-phases (add-before 'build 'use-system-sodium (lambda _ - (setenv "SODIUM_INSTALL" "system") - #t)) + (setenv "SODIUM_INSTALL" "system"))) (replace 'check (lambda _ - (let ((build-directory - (car (scandir "build" (cut string-prefix? "lib" <>))))) - (setenv "PYTHONPATH" - (string-append "./build/" build-directory ":" - (getenv "PYTHONPATH"))) - (invoke "pytest" "-vv"))))))) + (invoke "pytest" "-vv")))))) (native-inputs `(("python-hypothesis" ,python-hypothesis) ("python-pytest" ,python-pytest))) -- cgit v1.2.3