mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
Revert "qemu: 2.2.1 -> 2.4.0"
This reverts commit 0e0e3c0c08
.
I've been seeing quite some QEMU segfaults on Hydra,
hopefully reverting the bump will fix the issue.
This commit is contained in:
parent
072196adb0
commit
863c121c07
@ -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 ]
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user