From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 2/5] gnu: qemu: Reorder inputs alphabetically. Date: Tue, 2 Aug 2016 15:45:28 +0200 Message-ID: <20160802134531.19272-2-david@craven.ch> References: <20160802134531.19272-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUa1Y-0004br-BG for guix-devel@gnu.org; Tue, 02 Aug 2016 09:46:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUa1U-0000Xt-35 for guix-devel@gnu.org; Tue, 02 Aug 2016 09:46:23 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:57423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUa1S-0000XY-SB for guix-devel@gnu.org; Tue, 02 Aug 2016 09:46:20 -0400 In-Reply-To: <20160802134531.19272-1-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: David Craven * gnu/packages/qemu.scm (qemu): Reorder inputs alphabetically. --- gnu/packages/qemu.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 911ed4c..6b5a41b 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -118,29 +118,28 @@ (string-append "# " all))) #t))))) (inputs ; TODO: Add optional inputs. - `(("sdl" ,sdl) - ("mesa" ,mesa) - ("libusb" ,libusb) ;USB pass-through support - - ;; ("libaio" ,libaio) + `(("alsa-lib" ,alsa-lib) + ("attr" ,attr) ("glib" ,glib) - ("ncurses" ,ncurses) - ("libpng" ,libpng) + ;; ("libaio" ,libaio) + ("libattr" ,attr) + ("libcap" ,libcap) ; virtfs support requires libcap & libattr ("libjpeg" ,libjpeg-8) + ("libpng" ,libpng) + ("libusb" ,libusb) ;USB pass-through support + ("mesa" ,mesa) + ("ncurses" ,ncurses) + ;; ("pciutils" ,pciutils) ("pixman" ,pixman) - ;; ("vde2" ,vde2) + ("sdl" ,sdl) ("util-linux" ,util-linux) - ("libcap" ,libcap) ; virtfs support requires libcap & libattr - ("libattr" ,attr) - ;; ("pciutils" ,pciutils) - ("alsa-lib" ,alsa-lib) - ("zlib" ,zlib) - ("attr" ,attr))) - (native-inputs `(("pkg-config" ,pkg-config) + ;; ("vde2" ,vde2) + ("zlib" ,zlib))) + (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. + ("perl" ,perl) + ("pkg-config" ,pkg-config) ("python" ,python-2) ; incompatible with Python 3 according to error message - ("glib" ,glib "bin") ; gtester, etc. - ("texinfo" ,texinfo) - ("perl" ,perl))) + ("texinfo" ,texinfo))) (home-page "http://www.qemu-project.org") (synopsis "Machine emulator and virtualizer") (description @@ -175,4 +174,4 @@ server and embedded PowerPC, and S390 guests.") ;; Remove dependencies on optional libraries, notably GUI libraries. (inputs (fold alist-delete (package-inputs qemu) - '("sdl" "mesa" "libusb"))))) + '("libusb" "mesa" "sdl"))))) -- 2.9.0