[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50084] [PATCH v3] gnu: waypipe: Clean up phases and dependencies.
From: |
Robby Zambito |
Subject: |
[bug#50084] [PATCH v3] gnu: waypipe: Clean up phases and dependencies. |
Date: |
Wed, 18 Aug 2021 22:02:35 -0400 |
* gnu/packages/xdisorg.scm (waypipe)[arguments]: Remove unused
argument from fix-sleep-path phase.
[native-inputs]: Add python, coreutils.
[inputs]: Remove python, coreutils.
---
Paul,
Thank you for the tips. I've removed the unused outputs argument, as
well as the out variable.
I'm a bit confused as to why test dependencies are supposed to be
native-inputs. Aren't the tests run on the target architecture, not the
build machine architecture? And aren't native-inputs built for the build
machine architecture?
I cross compiled the package for armhf-linux and aarch64-linux and it
built and tested fine with the changes you suggested, but I also did the
same with how I had it previously.
Sincerely,
Robby
gnu/packages/xdisorg.scm | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index ba520d35ae..f5b041a590 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -885,19 +885,15 @@ include cursor in the resulting image.")
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-sleep-path
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (coreutils (assoc-ref inputs "coreutils")))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "./test/startup_failure.py"
- (("sleep")
- (string-append coreutils "/bin/sleep")))
- #t))))))
+ (("sleep") (string-append coreutils "/bin/sleep")))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("scdoc" ,scdoc)))
- (inputs
- ;; For tests
- `(("python" ,python)
+ ("scdoc" ,scdoc)
+ ;; For tests
+ ("python" ,python)
("coreutils" ,coreutils)))
(home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe")
(synopsis "Proxy for Wayland protocol applications")
--
2.32.0
[bug#50084] [PATCH] gnu: Add waypipe., Paul A. Patience, 2021/08/18
[bug#50084] [PATCH v3] gnu: waypipe: Clean up phases and dependencies., Robby Zambito, 2021/08/19
[bug#50084] [PATCH] gnu: Add waypipe., Robby Zambito, 2021/08/29