From b03b5456b3c15c4d6d72090143c095df1f7e51f0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 Jan 2021 17:58:54 -0500 Subject: 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(-) (limited to 'gnu/packages') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eb538f6540..f09d8e9522 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Hartmut Goebel -;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2017, 2021 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Andreas Enge @@ -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 -- cgit 1.4.1