From 0e0e3c0c08b77a64fc934795dc5d9647fbd58d42 Mon Sep 17 00:00:00 2001
From: Anton Fedotov <ad.fedotov@gmail.com>
Date: Thu, 13 Aug 2015 14:15:11 +0300
Subject: [PATCH] qemu: 2.2.1 -> 2.4.0
---
pkgs/applications/virtualization/qemu/default.nix | 8 ++++----
.../virtualization/qemu/no-etc-install.patch | 11 ++++-------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a5d403457de..46581994910 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
-, libseccomp, libaio, libcap_ng, gnutls
+, libseccomp, libaio, libcap_ng, gnutls, nettle
, makeWrapper
, pulseSupport ? true, libpulseaudio
, sdlSupport ? true, SDL
@@ -11,7 +11,7 @@
with stdenv.lib;
let
- n = "qemu-2.2.1";
+ n = "qemu-2.4.0";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://wiki.qemu.org/download/${n}.tar.bz2";
- sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6";
+ sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";
};
buildInputs =
[ python zlib pkgconfig glib ncurses perl pixman attr libcap
vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp
- libcap_ng gnutls
+ libcap_ng gnutls nettle
]
++ optionals pulseSupport [ libpulseaudio ]
++ optionals sdlSupport [ SDL ]
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 81d29feea3d..833f030bed3 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,14 +1,11 @@
-diff --git a/Makefile b/Makefile
-index d6b9dc1..ce7c493 100644
--- a/Makefile
+++ b/Makefile
-@@ -384,8 +384,7 @@ install-confdir:
- install-sysconfig: install-datadir install-confdir
- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
+@@ -418,7 +418,7 @@
--install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
+
+ install: all $(if $(BUILD_DOCS),install-doc) \
-install-datadir install-localstatedir
-+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
++install-datadir
ifneq ($(TOOLS),)
$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
endif