public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu: 4.1.0 -> 4.2.0

Browse Source
This commit is contained in:
Robert Scott 2019-12-18 22:00:49 +00:00
parent fb1bc1b891
commit 8c3a97fa7e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/qemu/default.nix
View File

@ -35,7 +35,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.1.0"; version = "4.2.0";
pname = "qemu" pname = "qemu"
+ stdenv.lib.optionalString xenSupport "-xen" + stdenv.lib.optionalString xenSupport "-xen"
+ stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only"
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29"; sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w";
}; };
nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];

11
pkgs/applications/virtualization/qemu/no-etc-install.patch
View File

@ -1,13 +1,12 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 85862fb8..ed52c5ec 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -841,7 +841,7 @@ endif @@ -867,7 +867,7 @@ install-includedir:
$(INSTALL_DIR) "$(DESTDIR)$(includedir)"
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 install: all $(if $(BUILD_DOCS),install-doc) \
- install-datadir install-localstatedir install-includedir \
-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ + install-datadir install-includedir \
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
recurse-install recurse-install
ifneq ($(TOOLS),) ifneq ($(TOOLS),)