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

* Qemu: apply the Samba patch from KVM.

Browse Source 
svn path=/nixpkgs/trunk/; revision=11991
This commit is contained in:
Eelco Dolstra 2008-06-05 15:43:06 +00:00
parent 13463a6f01
commit 125c7ea4e3
3 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/virtualization/qemu/0.9.0.nix
View File

@ -1,28 +0,0 @@
args : with args;
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz;
sha256 = "1h85njd8xvn472yhcm92rjyzqjr719ab73rxwmz9cm2n6gwsq7s9";
};
buildInputs = [ SDL zlib which ];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
preConfigure = FullDepEntry ("
gcc --version
") [minInit];
in
stdenv.mkDerivation rec {
name = "qemu-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [ preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
QEmu processor emulator.
";
inherit src;
};
}

44
pkgs/applications/virtualization/qemu/0.9.1.nix
View File

@ -1,28 +1,20 @@
args : with args; {stdenv, fetchurl, SDL, zlib, which}:
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.1.tar.gz;
sha256 = "199mb12w141yh2afzznh539jsip4h79kfsxwaj1xhzfwljsd0mj7";
};
buildInputs = [ SDL zlib which ]; stdenv.mkDerivation {
configureFlags = [ ]; name = "qemu-0.9.1";
} null; /* null is a terminator for sumArgs */
in with localDefs; src = fetchurl {
let url = http://bellard.org/qemu/qemu-0.9.1.tar.gz;
preConfigure = FullDepEntry (" sha256 = "199mb12w141yh2afzznh539jsip4h79kfsxwaj1xhzfwljsd0mj7";
gcc --version };
") [minInit];
in patches = [../../../os-specific/linux/kvm/smbd-path.patch];
stdenv.mkDerivation rec {
name = "qemu-"+version; patchFlags = "-p2";
builder = writeScript (name + "-builder")
(textClosure localDefs [ preConfigure doConfigure doMakeInstall doForceShare doPropagate]); buildInputs = [SDL zlib which];
meta = {
description = " meta = {
QEmu processor emulator. description = "QEmu processor emulator";
"; };
inherit src;
};
} }

11
pkgs/top-level/all-packages.nix
View File

@ -6188,16 +6188,11 @@ let pkgs = rec {
python = python25; python = python25;
}; };
qemuFun = lib.sumArgs (selectVersion ../applications/virtualization/qemu "0.9.1") { qemu = import ../applications/virtualization/qemu/0.9.1.nix {
inherit fetchurl; inherit fetchurl SDL zlib which;
builderDefs = builderDefs { stdenv = overrideGCC stdenv gcc34;
stdenv = (overrideGCC stdenv gcc34)//{gcc=gcc34;};
};
inherit SDL zlib which;
}; };
qemu = qemuFun null;
qemuImageFun = lib.sumArgs qemuImageFun = lib.sumArgs
(selectVersion ../applications/virtualization/qemu/linux-img "0.2") { (selectVersion ../applications/virtualization/qemu/linux-img "0.2") {
inherit builderDefs fetchurl stdenv; inherit builderDefs fetchurl stdenv;