From 4f906f38a8d4307f5769315e3474089122f86010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 9 Nov 2009 09:15:58 +0000 Subject: [PATCH] Updating qemu to 0.11.0, and making it use stdenv with the usual gcc, and not an older. svn path=/nixpkgs/trunk/; revision=18305 --- .../virtualization/qemu/0.11.0.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/virtualization/qemu/0.11.0.nix diff --git a/pkgs/applications/virtualization/qemu/0.11.0.nix b/pkgs/applications/virtualization/qemu/0.11.0.nix new file mode 100644 index 00000000000..bbcf1806452 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/0.11.0.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, SDL, zlib, which}: + +stdenv.mkDerivation { + name = "qemu-0.11.0"; + + src = fetchurl { + url = http://download.savannah.gnu.org/releases/qemu/qemu-0.11.0.tar.gz; + sha256 = "1w3n61lzwvqg1ygn0vs8syybbmbcbk7lfyya098k201lp5rpwamw"; + }; + + patchFlags = "-p2"; + + buildInputs = [SDL zlib which]; + + meta = { + description = "QEmu processor emulator"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16395cc81a0..06bfa873377 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7468,9 +7468,8 @@ let inherit fetchurl stdenv pkgconfig imagemagick boost python; }; - qemu = import ../applications/virtualization/qemu/0.10.3.nix { - inherit fetchurl SDL zlib which; - stdenv = overrideGCC stdenv gcc34; + qemu = import ../applications/virtualization/qemu/0.11.0.nix { + inherit stdenv fetchurl SDL zlib which; }; qemuSVN = import ../applications/virtualization/qemu/svn-6642.nix {