diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 14:36:16 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 14:36:16 -0800 |
commit | d72c4791bc4770b8760d9307e2343855e35f5615 (patch) | |
tree | 04a28ce214069422ebe94bb9aaa119703a0b2bbc /pkgs/applications/virtualization | |
parent | 446fec8c2dda7ab24783713f16092803b7b1e464 (diff) | |
parent | 66bf75415f4e7a1571d41a2fed11838eb530376b (diff) | |
download | nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.tar nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.tar.gz nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.tar.bz2 nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.tar.lz nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.tar.xz nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.tar.zst nixpkgs-d72c4791bc4770b8760d9307e2343855e35f5615.zip |
Merge remote-tracking branch 'origin' into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/bochs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 48ff2d3cf49..f6e202ac499 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.10-glibc-2.26.patch ]; - buildInputs = with stdenv.lib; + buildInputs = [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. ''; - homepage = http://bochs.sourceforge.net/; + homepage = "http://bochs.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; |