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

Merge pull request #3529 from AndersonTorres/bochs

Browse Source 
Bochs: update to version 2.6.6
This commit is contained in:
Michael Raskin 2014-08-23 12:48:05 +04:00
commit 2991b5a2f3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/virtualization/bochs/default.nix
View File

@ -1,34 +1,34 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig, gtk
, libX11 , mesa , libX11 , mesa
, sdlSupport ? true, SDL ? null , sdlSupport ? true, SDL ? null
, termSupport ? true , ncurses ? null, readline ? null , termSupport ? true , ncurses ? null, readline ? null
, wxSupport ? true , gtk ? null , wxGTK ? null , pkgconfig ? null , wxSupport ? false, wxGTK ? null
, wgetSupport ? false, wget ? null , wgetSupport ? false, wget ? null
, curlSupport ? false, curl ? null , curlSupport ? false, curl ? null
}: }:
assert sdlSupport -> (SDL != null); assert sdlSupport -> (SDL != null);
assert termSupport -> (ncurses != null&& readline != null); assert termSupport -> (ncurses != null&& readline != null);
assert wxSupport -> (gtk != null && wxGTK != null && pkgconfig != null); assert wxSupport -> (gtk != null && wxGTK != null);
assert wgetSupport -> (wget != null); assert wgetSupport -> (wget != null);
assert curlSupport -> (curl != null); assert curlSupport -> (curl != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bochs-${version}"; name = "bochs-${version}";
version = "2.6.2"; version = "2.6.6";
src = fetchurl { src = fetchurl {
url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr"; sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f";
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ libX11 mesa ] [ pkgconfig gtk libX11 mesa ]
++ optionals sdlSupport [ SDL ] ++ optionals sdlSupport [ SDL ]
++ optionals termSupport [ readline ncurses ] ++ optionals termSupport [ readline ncurses ]
++ optionals wxSupport [ gtk wxGTK pkgconfig ] ++ optionals wxSupport [ wxGTK ]
++ optionals wgetSupport [ wget ] ++ optionals wgetSupport [ wget ]
++ optionals curlSupport [ curl ]; ++ optionals curlSupport [ curl ];
@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
--enable-pnic --enable-pnic
''; '';
NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/";
meta = { meta = {
description = "An open-source IA-32 (x86) PC emulator"; description = "An open-source IA-32 (x86) PC emulator";
longDescription = '' longDescription = ''
@ -61,3 +63,4 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }
# TODO: study config.bochs.* implementation (like config.ffmpeg.* options)

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

@ -583,7 +583,7 @@ let
bmon = callPackage ../tools/misc/bmon { }; bmon = callPackage ../tools/misc/bmon { };
bochs = callPackage ../applications/virtualization/bochs { }; bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; };
boomerang = callPackage ../development/tools/boomerang { }; boomerang = callPackage ../development/tools/boomerang { };