diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-02 23:49:10 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-02 23:49:10 +0100 |
commit | fb98351621a6b311d4ff9593d6c22d40a3b3fe8f (patch) | |
tree | 05fb46c92657a70cad6923c64b63540a88555bb4 /gnu/packages/virtualization.scm | |
parent | d614f0bba90c86c836131eea3ebb9cbd30f19abf (diff) | |
parent | 15a6805751309452616999933492f1fb9da8bcec (diff) | |
download | guix-fb98351621a6b311d4ff9593d6c22d40a3b3fe8f.tar guix-fb98351621a6b311d4ff9593d6c22d40a3b3fe8f.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r-- | gnu/packages/virtualization.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d3f474d17a..b8d85e03a4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -303,10 +303,10 @@ server and embedded PowerPC, and S390 guests.") (search-patches "qemu-glibc-2.27.patch")))) ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. (native-inputs `(("python-2" ,python-2) - ,@(fold alist-delete (package-native-inputs qemu) + ,@(fold alist-delete (package-native-inputs qemu-minimal) '("python-wrapper" "python-sphinx")))) (inputs - (fold alist-delete (package-inputs qemu) + (fold alist-delete (package-inputs qemu-minimal) ;; Disable seccomp support, because it's not required for the GRUB ;; test suite, and because it fails with libseccomp 2.4.2 and later. '("libseccomp")))))) |