diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-22 23:54:34 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-22 23:54:34 +0200 |
| commit | cdbd81ce144f17644ceebd3d08723aa244696a05 (patch) | |
| tree | f2d4c484a5a8880fb32b81ac4330842c88a53e2a /gnu/packages/virtualization.scm | |
| parent | 10664c0f1c351eae24629127d97fe23f5e18a93c (diff) | |
| parent | ec130e1a1b7f3b87b1a6e626754f7e7a07f6b717 (diff) | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5c5225b694..f5bdedd45e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -385,6 +385,14 @@ (cut string-suffix? "-linux-user" <>)))))))) + (add-before 'check 'set-SOCK_DIR + (lambda _ + ;; The default value for SOCK_DIR is TMPDIR, which can be long + ;; in the build chroot (e.g.: + ;; /tmp/guix-build-qemu-minimal-drv-0); set it to SOCK_DIR to + ;; avoid using more than 109 characters for socket files (the + ;; limit when using the kernel Linux). + (setenv "SOCK_DIR" "/tmp"))) (add-after 'install 'delete-firmwares (lambda _ ;; Delete firmares that are accessible on --firmwarepath. @@ -542,14 +550,7 @@ server and embedded PowerPC, and S390 guests.") #~(modify-phases #$phases (delete 'configure-user-static) (delete 'build-user-static) - (delete 'install-user-static) - (add-after 'disable-unusable-tests 'disable-extra-tests - (lambda _ - ;; Interesting, the iothreads-commit-active test only fails in - ;; qemu-minimal, not the complete variant (see: - ;; https://gitlab.com/qemu-project/qemu/-/issues/1855). - (delete-file - "tests/qemu-iotests/tests/iothreads-commit-active"))))))) + (delete 'install-user-static))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (filter (lambda (input) |