b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bochs: cosmetical rewrite

Browse source
This commit is contained in:
AndersonTorres 2022-10-30 11:28:31 -03:00
parent f5a573fc29
commit c6cbeab8bc
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
pkgs/applications/emulators/bochs/default.nix
View file

@ -1,26 +1,26 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, SDL2
, curl
, docbook_xml_dtd_45 , docbook_xml_dtd_45
, docbook_xsl , docbook_xsl
, libtool , gtk3
, pkg-config
, curl
, readline
, wget
, libobjc
, enableX11 ? !stdenv.isDarwin
, libGL , libGL
, libGLU , libGLU
, libX11 , libX11
, libXpm , libXpm
, enableSdl2 ? true , libobjc
, SDL2 , libtool
, enableTerm ? true
, ncurses , ncurses
, enableWx ? !stdenv.isDarwin , pkg-config
, readline
, wget
, wxGTK , wxGTK
, gtk3 , enableSDL2 ? true
, enableTerm ? true
, enableWx ? !stdenv.isDarwin
, enableX11 ? !stdenv.isDarwin
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "2.7"; version = "2.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/${finalAttrs.pname}/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; url = "mirror://sourceforge/project/bochs/bochs/${finalAttrs.version}/bochs-${finalAttrs.version}.tar.gz";
hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo="; hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo=";
}; };
@ -43,20 +43,20 @@ stdenv.mkDerivation (finalAttrs: {
curl curl
readline readline
wget wget
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals enableSDL2 [
libobjc SDL2
] ++ lib.optionals enableTerm [
ncurses
] ++ lib.optionals enableWx [
gtk3
wxGTK
] ++ lib.optionals enableX11 [ ] ++ lib.optionals enableX11 [
libGL libGL
libGLU libGLU
libX11 libX11
libXpm libXpm
] ++ lib.optionals enableSdl2 [ ] ++ lib.optionals stdenv.isDarwin [
SDL2 libobjc
] ++ lib.optionals enableTerm [
ncurses
] ++ lib.optionals enableWx [
wxGTK
gtk3
]; ];
configureFlags = [ configureFlags = [
@ -114,6 +114,15 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-voodoo" "--enable-voodoo"
"--enable-x86-64" "--enable-x86-64"
"--enable-x86-debugger" "--enable-x86-debugger"
] ++ lib.optionals enableSDL2 [
"--with-sdl2"
] ++ lib.optionals enableTerm [
"--with-term"
] ++ lib.optionals enableWx [
"--with-wx"
] ++ lib.optionals enableX11 [
"--with-x"
"--with-x11"
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
"--enable-e1000" "--enable-e1000"
"--enable-es1370" "--enable-es1370"
@ -121,15 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-plugins" "--enable-plugins"
"--enable-pnic" "--enable-pnic"
"--enable-sb16" "--enable-sb16"
] ++ lib.optionals enableX11 [
"--with-x"
"--with-x11"
] ++ lib.optionals enableSdl2 [
"--with-sdl2"
] ++ lib.optionals enableTerm [
"--with-term"
] ++ lib.optionals enableWx [
"--with-wx"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;