diff options
| author | Domen Kožar <domen@dev.si> | 2015-09-07 12:20:58 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-09-07 12:22:13 +0200 |
| commit | df592a6535d1800a99bed83747a5756d3fc149a4 (patch) | |
| tree | 043393c013075f16dc253ea1d5aff03fb4f880ff /pkgs/applications/virtualization | |
| parent | d2f0bc747d581b843713a1dfc637e855ddf980cc (diff) | |
| download | nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.tar nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.tar.gz nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.tar.bz2 nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.tar.lz nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.tar.xz nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.tar.zst nixlib-df592a6535d1800a99bed83747a5756d3fc149a4.zip | |
Revert "qemu: 2.2.1 -> 2.4.0"
This reverts commit 0e0e3c0c08b77a64fc934795dc5d9647fbd58d42. I've been seeing quite some QEMU segfaults on Hydra, hopefully reverting the bump will fix the issue. (cherry picked from commit 863c121c0782b82900d736f9f71dbcfa80f62e1d) Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/qemu/no-etc-install.patch | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 465819949108..a5d403457de0 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, nettle +, libseccomp, libaio, libcap_ng, gnutls , makeWrapper , pulseSupport ? true, libpulseaudio , sdlSupport ? true, SDL @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.4.0"; + n = "qemu-2.2.1"; 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 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls nettle + libcap_ng gnutls ] ++ 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 833f030bed35..81d29feea3de 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,11 +1,14 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 --- a/Makefile +++ b/Makefile -@@ -418,7 +418,7 @@ +@@ -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)" - - install: all $(if $(BUILD_DOCS),install-doc) \ +-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ -install-datadir install-localstatedir -+install-datadir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif |