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

Merge pull request #5027 from AndersonTorres/bochs

Browse Source 
Bochs: upgrade to 2.6.7
This commit is contained in:
Georges Dubus 2014-11-18 15:01:34 +01:00
commit 7162292c4e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, pkgconfig, libtool , pkgconfig, libtool
, gtk, mesa, readline, libX11, libXpm , gtk, mesa, readline, libX11, libXpm
, docbook_xml_dtd_45, docbook_xsl , docbook_xml_dtd_45, docbook_xsl
, sdlSupport ? true, SDL ? null , sdlSupport ? true, SDL2 ? null
, termSupport ? true , ncurses ? null , termSupport ? true , ncurses ? null
, wxSupport ? false, wxGTK ? null # Warning! Broken , wxSupport ? false, wxGTK ? null # Warning! Broken
# Optional, undocumented dependencies # Optional, undocumented dependencies
@ -10,7 +10,7 @@
, curlSupport ? false, curl ? null , curlSupport ? false, curl ? null
}: }:
assert sdlSupport -> (SDL != null); assert sdlSupport -> (SDL2 != null);
assert termSupport -> (ncurses != null); assert termSupport -> (ncurses != null);
assert wxSupport -> (gtk != null && wxGTK != null); assert wxSupport -> (gtk != null && wxGTK != null);
assert wgetSupport -> (wget != null); assert wgetSupport -> (wget != null);
@ -19,11 +19,11 @@ assert curlSupport -> (curl != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bochs-${version}"; name = "bochs-${version}";
version = "2.6.6"; version = "2.6.7";
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 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f"; sha256 = "10l2pgzwnmng0rd44kqv7y46nwpcc18j53h3kf3dlqlnd7mlwdd4";
}; };
# The huge list of configurable options # The huge list of configurable options
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
++ optionals termSupport [ ncurses ] ++ optionals termSupport [ ncurses ]
++ optionals sdlSupport [ SDL ] ++ optionals sdlSupport [ SDL2 ]
++ optionals wxSupport [ wxGTK ] ++ optionals wxSupport [ wxGTK ]
++ optionals wgetSupport [ wget ] ++ optionals wgetSupport [ wget ]
++ optionals curlSupport [ curl ]; ++ optionals curlSupport [ curl ];
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
"--enable-raw-serial=no" ] "--enable-raw-serial=no" ]
# Boolean flags # Boolean flags
++ stdenv.lib.optional termSupport "--with-term" ++ stdenv.lib.optional termSupport "--with-term"
++ stdenv.lib.optional sdlSupport "--with-sdl" ++ stdenv.lib.optional sdlSupport "--with-sdl2"
++ stdenv.lib.optional wxSupport "--with-wx" ++ stdenv.lib.optional wxSupport "--with-wx"
++ stdenv.lib.optional largefile "--enable-largefile" ++ stdenv.lib.optional largefile "--enable-largefile"
++ stdenv.lib.optional idleHack "--enable-idle-hack" ++ stdenv.lib.optional idleHack "--enable-idle-hack"