diff options
| author | Robert Scott <code@humanleg.org.uk> | 2019-12-18 22:00:49 +0000 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2019-12-18 22:00:49 +0000 |
| commit | 8c3a97fa7e18046c2847ac75b95a88bc18683f8f (patch) | |
| tree | 7d3e416bb83552df36f44ff59c2444e98530f715 /pkgs/applications/virtualization | |
| parent | fb1bc1b891f5c95b98a333e46b043018ff50d254 (diff) | |
| download | nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.tar nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.tar.gz nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.tar.bz2 nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.tar.lz nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.tar.xz nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.tar.zst nixlib-8c3a97fa7e18046c2847ac75b95a88bc18683f8f.zip | |
qemu: 4.1.0 -> 4.2.0
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/qemu/no-etc-install.patch | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f90873c6e336..b6dea6118688 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { - version = "4.1.0"; + version = "4.2.0"; pname = "qemu" + stdenv.lib.optionalString xenSupport "-xen" + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29"; + sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 57e190f5ae79..5bab930d06a5 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,13 +1,12 @@ diff --git a/Makefile b/Makefile -index 85862fb8..ed52c5ec 100644 --- a/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: all $(if $(BUILD_DOCS),install-doc) install-datadir \ + install: all $(if $(BUILD_DOCS),install-doc) \ +- install-datadir install-localstatedir install-includedir \ ++ install-datadir install-includedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(TOOLS),) |