apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit 6a265f3cbde909f14f456585408e67aaf2998bdc Author: Maxim Cournoyer <[email protected]> AuthorDate: Wed Jan 27 17:58:54 2021 -0500 gnu: enjarify: Do not alter PYTHONPATH. * gnu/packages/android.scm (enjarify): Do not alter PYTHONPATH. --- gnu/packages/android.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eb538f6..f09d8e9 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2020 Marius Bakke <[email protected]> ;;; Copyright © 2017 Julien Lepiller <[email protected]> ;;; Copyright © 2017 Hartmut Goebel <[email protected]> -;;; Copyright © 2017 Maxim Cournoyer <[email protected]> +;;; Copyright © 2017, 2021 Maxim Cournoyer <[email protected]> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2018 Efraim Flashner <[email protected]> ;;; Copyright © 2019, 2020 Andreas Enge <[email protected]> @@ -1026,13 +1026,6 @@ connected devices via ADB.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'enjarify-wrapper-inherit-pythonpath - ;; enjarify sets PYTHONPATH from a shell script, overwriting - ;; PYTHONPATH set from guix. Comment out this line. - (lambda _ - (substitute* "enjarify.sh" - (("export PYTHONPATH") "# export PYTHONPATH")) - #t)) (add-before 'check 'fixup-expected-test-results ;; Upstream adjusted this test in commit: ;; 3ae884a6485af82d300515813f537685b08dd800
