From f7c4dff95e88d58d61c51b2a6b94c90e2e4e0c4b Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 25 Oct 2022 15:33:40 +0200 Subject: [builder][server][proxy] prevent Guix package interference with locally-installed Python packages --- hydrilla-guix/hydrilla.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/hydrilla-guix/hydrilla.scm b/hydrilla-guix/hydrilla.scm index f580942..d505bf8 100644 --- a/hydrilla-guix/hydrilla.scm +++ b/hydrilla-guix/hydrilla.scm @@ -296,12 +296,27 @@ static types.") (local-file (string-append %source-dir "/dist/" source-tarball-name))) (build-system python-build-system) (arguments - `(#:phases + `(#:modules ((ice-9 match) + (guix build utils) + (guix build python-build-system)) + #:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest"))))))) + (invoke "pytest")))) + (add-after 'wrap 'prevent-local-package-interference + (lambda* (#:key outputs #:allow-other-keys) + (match-let ((((_ . dir)) outputs)) + (for-each (lambda (prog-name) + (substitute* (string-append dir "/bin/" prog-name) + (("^#!/.*$" shabang) + (string-append shabang + "export PYTHONNOUSERSITE=1\n")))) + '("hydrilla" + "hydrilla-server" + "hydrilla-builder" + "haketilo")))))))) (propagated-inputs (list mitmproxy python-beautifulsoup4 -- cgit v1.2.3