diff options
author | Maxime Devos <maximedevos@telenet.be> | 2021-07-02 12:07:07 +0200 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-21 01:39:52 -0400 |
commit | 044a037da4b746acb9e0fedf699357a49e6c2cb6 (patch) | |
tree | 9aedacfb87fa6ba95659533bc6ab05fdad889551 | |
parent | 81e3a8b6d1189e1a1992e36bed984996bcaf9da0 (diff) |
gnu: virtualization: Add 'bash' input for 'wrap-program'.
It is required for cross-compilation.
* gnu/packages/virtualization.scm
(ganeti)[inputs]: Add 'bash-minimal'.
(virt-manager): Delete trail6g #t.
[inputs]: Likewise.
(criu)[inputs]: Likewise. Remove labels.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ib5ae01ea43ac99085a172e0e015d316c99b66897
-rw-r--r-- | gnu/packages/virtualization.scm | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 865e827146..58939a7ffc 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -951,7 +951,8 @@ firmware blobs. You can ("shelltestrunner" ,shelltestrunner) ("tzdata" ,tzdata-for-tests))) (inputs - (list iputils ;for 'arping' + (list bash-minimal + iputils ;for 'arping' curl fping iproute @@ -1637,15 +1638,13 @@ virtualization library.") (add-after 'unpack 'fix-setup (lambda* (#:key outputs #:allow-other-keys) (substitute* "virtinst/buildconfig.py" - (("/usr") (assoc-ref outputs "out"))) - #t)) + (("/usr") (assoc-ref outputs "out"))))) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. (substitute* "virtManager/createconn.py" (("/usr(/bin/qemu-system-[a-zA-Z0-9_-]+)" _ suffix) - (search-input-file inputs suffix))) - #t)) + (search-input-file inputs suffix))))) (add-before 'wrap 'wrap-with-GI_TYPELIB_PATH (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) @@ -1663,8 +1662,7 @@ virtualization library.") (wrap-program file `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths)))) - bin-files)) - #t)) + bin-files)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1674,14 +1672,14 @@ virtualization library.") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "pytest" "--uitests")) - #t)) + (invoke "dbus-run-session" "--" "pytest" "--uitests")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'wrap 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (inputs - (list dconf + (list bash-minimal + dconf gtk+ gtk-vnc gtksourceview-4 @@ -1738,7 +1736,7 @@ domains, their live performance and resource utilization statistics.") (build-system gnu-build-system) (arguments `(#:test-target "test" - #:tests? #f ; tests require mounting as root + #:tests? #f ; tests require mounting as root #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=$(PREFIX)/lib") @@ -1764,14 +1762,13 @@ domains, their live performance and resource utilization statistics.") (("ARMV.*:=.*") "ARMV := 7\n")) ;; Hard-code the correct PLUGINDIR above. (substitute* "criu/include/plugin.h" - (("/var") (string-append (assoc-ref outputs "out")))) - )) + (("/var") (string-append (assoc-ref outputs "out")))))) ;; TODO: use ;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980) ;; when it no longer throws due to trying to call UTIME on symlinks. (add-after 'unpack 'ensure-no-mtimes-pre-1980 (lambda _ - (let ((early-1980 315619200)) ; 1980-01-02 UTC + (let ((early-1980 315619200)) ; 1980-01-02 UTC (ftw "." (lambda (file stat flag) (unless (or (<= early-1980 (stat:mtime stat)) (eq? (stat:type stat) 'symlink)) @@ -1805,15 +1802,16 @@ domains, their live performance and resource utilization statistics.") (let ((out (assoc-ref outputs "out"))) (for-each delete-file (find-files out "\\.a$")))))))) (inputs - `(("protobuf" ,protobuf) - ("python-protobuf" ,python-protobuf) - ("iproute" ,iproute) - ("libaio" ,libaio) - ("libcap" ,libcap) - ("libnet" ,libnet) - ("libnl" ,libnl) - ("libbsd" ,libbsd) - ("nftables" ,nftables))) + (list bash-minimal + protobuf + python-protobuf + iproute + libaio + libcap + libnet + libnl + libbsd + nftables)) (native-inputs (list pkg-config perl |