From 27b52c1f6aa036ec99691a5c76ecf697e09cd62f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 26 Apr 2018 08:14:50 +0200 Subject: gnu: qemu: Build with Python 3 and SDL2 support. * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl. [native-inputs]: Use python-wrapper instead of python@2. * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 instead of sdl from inherited packages. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. [native-inputs]: Remove python-wrapper from inherited packages and use python@2 instead. * gnu/packages/debug.scm (american-fuzzy-lop): Inherit from moved hidden-package qemu-minimal-2.10. --- gnu/packages/debug.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/debug.scm') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 112c656ff8..c12baf4e2b 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,7 +170,7 @@ tools that process C/C++ code.") (inputs `(("custom-qemu" ;; The afl-qemu tool builds qemu 2.10.0 with a few patches applied. - ,(package (inherit (@@ (gnu packages bootloaders) qemu-minimal-2.10)) + ,(package (inherit qemu-minimal-2.10) (name "afl-qemu") (inputs `(("afl-src" ,source) -- cgit 1.4.1