amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: virtualization: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/virtualization.scm
(ganeti)[inputs]: Add 'bash-minimal'.
(virt-manager)[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
This commit is contained in:
Maxime Devos 2021-07-02 12:07:07 +02:00 • committed by Ludovic Courtès
parent 240d406b43
commit 7351aa3b3e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/virtualization.scm
View file

@ -1030,7 +1030,8 @@ firmware blobs. You can
("shelltestrunner" ,shelltestrunner) ("shelltestrunner" ,shelltestrunner)
("tzdata" ,tzdata-for-tests))) ("tzdata" ,tzdata-for-tests)))
(inputs (inputs
(list iputils ;for 'arping' (list bash-minimal
iputils ;for 'arping'
curl curl
fping fping
iproute iproute
@ -1758,7 +1759,8 @@ virtualization library.")
(add-after 'wrap 'glib-or-gtk-wrap (add-after 'wrap 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs (inputs
(list dconf (list bash-minimal
dconf
gtk+ gtk+
gtk-vnc gtk-vnc
gtksourceview-4 gtksourceview-4
@ -1963,7 +1965,7 @@ client desktops.
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:tests? #f ; tests require mounting as root #:tests? #f ; tests require mounting as root
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "LIBDIR=$(PREFIX)/lib") (string-append "LIBDIR=$(PREFIX)/lib")
@ -1989,14 +1991,13 @@ client desktops.
(("ARMV.*:=.*") "ARMV := 7\n")) (("ARMV.*:=.*") "ARMV := 7\n"))
;; Hard-code the correct PLUGINDIR above. ;; Hard-code the correct PLUGINDIR above.
(substitute* "criu/include/plugin.h" (substitute* "criu/include/plugin.h"
(("/var") (string-append (assoc-ref outputs "out")))) (("/var") (string-append (assoc-ref outputs "out"))))))
))
;; TODO: use ;; TODO: use
;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980) ;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980)
;; when it no longer throws due to trying to call UTIME on symlinks. ;; when it no longer throws due to trying to call UTIME on symlinks.
(add-after 'unpack 'ensure-no-mtimes-pre-1980 (add-after 'unpack 'ensure-no-mtimes-pre-1980
(lambda _ (lambda _
(let ((early-1980 315619200)) ; 1980-01-02 UTC (let ((early-1980 315619200)) ; 1980-01-02 UTC
(ftw "." (lambda (file stat flag) (ftw "." (lambda (file stat flag)
(unless (or (<= early-1980 (stat:mtime stat)) (unless (or (<= early-1980 (stat:mtime stat))
(eq? (stat:type stat) 'symlink)) (eq? (stat:type stat) 'symlink))
@ -2030,15 +2031,16 @@ client desktops.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(for-each delete-file (find-files out "\\.a$")))))))) (for-each delete-file (find-files out "\\.a$"))))))))
(inputs (inputs
`(("protobuf" ,protobuf) (list bash-minimal
("python-protobuf" ,python-protobuf) protobuf
("iproute" ,iproute) python-protobuf
("libaio" ,libaio) iproute
("libcap" ,libcap) libaio
("libnet" ,libnet) libcap
("libnl" ,libnl) libnet
("libbsd" ,libbsd) libnl
("nftables" ,nftables))) libbsd
nftables))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
perl perl