tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
bochs: fix build with glibc 2.26
Tracking issue: #31696
Orivej Desh
8 years ago
4cc5d222
9939032e
+18
2 changed files
expand all
collapse all
unified
split
pkgs
applications
virtualization
bochs
bochs-2.6.9-glibc-2.26.patch
default.nix
+14
pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch
···
1
1
+
diff --git a/iodev/network/slirp/slirp.h b/iodev/network/slirp/slirp.h
2
2
+
index 7c16aa3..202a1b7 100644
3
3
+
--- a/iodev/network/slirp/slirp.h
4
4
+
+++ b/iodev/network/slirp/slirp.h
5
5
+
@@ -33,8 +33,8 @@ typedef char *caddr_t;
6
6
+
#endif
7
7
+
8
8
+
#include <sys/types.h>
9
9
+
-#if defined(__OpenBSD__)
10
10
+
#include <stdint.h>
11
11
+
+#if defined(__OpenBSD__)
12
12
+
#include <sys/wait.h>
13
13
+
#endif
14
14
+
#ifdef HAVE_SYS_BITYPES_H
+4
pkgs/applications/virtualization/bochs/default.nix
···
26
26
sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
27
27
};
28
28
29
29
+
patches = [ ./bochs-2.6.9-glibc-2.26.patch ];
30
30
+
29
31
buildInputs = with stdenv.lib;
30
32
[ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
31
33
++ optionals termSupport [ ncurses ]
···
106
108
NIX_LDFLAGS="-L${libtool.lib}/lib";
107
109
108
110
hardeningDisable = [ "format" ];
111
111
+
112
112
+
enableParallelBuilding = true;
109
113
110
114
meta = {
111
115
description = "An open-source IA-32 (x86) PC emulator";