* [bug#53880] [PATCH 0/2] Fix build of protonvpn-cli
@ 2022-02-08 18:03 Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper Josselin Poiret via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2022-02-08 18:03 UTC (permalink / raw)
To: 53880; +Cc: Josselin Poiret
Hello,
These two patches fix the build failure of protonvpn-cli. The first
one fixes the wrap target, since the wrapper code now properly handles
re-wrapping a wrapped binary. The second removes the sanity-check
phase as the main entry point tries to create a directory under ~user,
which fails, and setting HOME=/tmp will not work since expanding ~user
uses the passwd database.
Best,
Josselin Poiret (2):
gnu: protonvpn-cli: Do not try to wrap the wrapper.
gnu: protonvpn-cli: Remove sanity-check phase.
gnu/packages/vpn.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
2.34.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#53880] [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper.
2022-02-08 18:03 [bug#53880] [PATCH 0/2] Fix build of protonvpn-cli Josselin Poiret via Guix-patches via
@ 2022-02-08 18:05 ` Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 2/2] gnu: protonvpn-cli: Remove sanity-check phase Josselin Poiret via Guix-patches via
2022-02-12 13:21 ` bug#53855: bug#53880: [PATCH 0/2] Fix build of protonvpn-cli Brice Waegeneire
2 siblings, 0 replies; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2022-02-08 18:05 UTC (permalink / raw)
To: 53880; +Cc: Josselin Poiret
* gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Try to wrap the
original program, and not the wrapper, as wrap-program handles that
properly.
---
gnu/packages/vpn.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 7f1d10d1eb..150dfa31b5 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -753,7 +753,7 @@ (define-public protonvpn-cli
;; Wrap entrypoint with paths to its hard dependencies.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((entrypoint (string-append (assoc-ref outputs "out")
- "/bin/.protonvpn-real")))
+ "/bin/protonvpn")))
(wrap-program entrypoint
#:sh (search-input-file inputs "bin/bash")
`("PATH" ":" prefix
--
2.34.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#53880] [PATCH 2/2] gnu: protonvpn-cli: Remove sanity-check phase.
2022-02-08 18:03 [bug#53880] [PATCH 0/2] Fix build of protonvpn-cli Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper Josselin Poiret via Guix-patches via
@ 2022-02-08 18:05 ` Josselin Poiret via Guix-patches via
2022-02-12 13:21 ` bug#53855: bug#53880: [PATCH 0/2] Fix build of protonvpn-cli Brice Waegeneire
2 siblings, 0 replies; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2022-02-08 18:05 UTC (permalink / raw)
To: 53880; +Cc: Josselin Poiret
* gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Remove sanity-check
phase.
---
gnu/packages/vpn.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 150dfa31b5..170ec1b663 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -768,7 +768,11 @@ (define-public protonvpn-cli
"openvpn"
"procps"
"which")))))
- #t)))))
+ #t))
+ ;; The `protonvpn' script wants to write to `~user' to initialize its
+ ;; logger, so simply setting HOME=/tmp won't cut it. Remove
+ ;; sanity-check.
+ (delete 'sanity-check))))
(native-inputs
(list python-docopt))
(inputs
--
2.34.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#53855: bug#53880: [PATCH 0/2] Fix build of protonvpn-cli
2022-02-08 18:03 [bug#53880] [PATCH 0/2] Fix build of protonvpn-cli Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 2/2] gnu: protonvpn-cli: Remove sanity-check phase Josselin Poiret via Guix-patches via
@ 2022-02-12 13:21 ` Brice Waegeneire
2 siblings, 0 replies; 4+ messages in thread
From: Brice Waegeneire @ 2022-02-12 13:21 UTC (permalink / raw)
To: Josselin Poiret; +Cc: 53855-done, 53880-done
Hello Josselin,
Josselin Poiret <dev@jpoiret.xyz> writes:
> Josselin Poiret (2):
> gnu: protonvpn-cli: Do not try to wrap the wrapper.
> gnu: protonvpn-cli: Remove sanity-check phase.
>
> gnu/packages/vpn.scm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
Thank you for the patch, it fixes <https://bugs.gnu.org/53855>. I've build the
package and ran the binary succesfully. It's pushed as
9c8f68f4796f23c11173fa3f90c69bc85b224ac6 with an added copyright header.
Cheers,
- Brice
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-12 13:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-08 18:03 [bug#53880] [PATCH 0/2] Fix build of protonvpn-cli Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper Josselin Poiret via Guix-patches via
2022-02-08 18:05 ` [bug#53880] [PATCH 2/2] gnu: protonvpn-cli: Remove sanity-check phase Josselin Poiret via Guix-patches via
2022-02-12 13:21 ` bug#53855: bug#53880: [PATCH 0/2] Fix build of protonvpn-cli Brice Waegeneire
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.