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

bochs: fix build with glibc 2.26

Browse Source 
Tracking issue: #31696
This commit is contained in:
Orivej Desh 2017-11-16 12:58:39 +00:00
parent 9939032e35
commit 4cc5d222ce
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/iodev/network/slirp/slirp.h b/iodev/network/slirp/slirp.h
index 7c16aa3..202a1b7 100644
--- a/iodev/network/slirp/slirp.h
+++ b/iodev/network/slirp/slirp.h
@@ -33,8 +33,8 @@ typedef char *caddr_t;
#endif
#include <sys/types.h>
-#if defined(__OpenBSD__)
#include <stdint.h>
+#if defined(__OpenBSD__)
#include <sys/wait.h>
#endif
#ifdef HAVE_SYS_BITYPES_H

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

@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
}; };
patches = [ ./bochs-2.6.9-glibc-2.26.patch ];
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
++ optionals termSupport [ ncurses ] ++ optionals termSupport [ ncurses ]
@ -107,6 +109,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
enableParallelBuilding = true;
meta = { meta = {
description = "An open-source IA-32 (x86) PC emulator"; description = "An open-source IA-32 (x86) PC emulator";
longDescription = '' longDescription = ''