diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-16 12:58:39 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-16 13:00:28 +0000 |
| commit | 4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3 (patch) | |
| tree | d2f47d11311138da9fe4bb20f46a9db73e8c85fe /pkgs/applications | |
| parent | 9939032e35bb144bc8f6b57ed6325089910f738c (diff) | |
| download | nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.tar nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.tar.gz nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.tar.bz2 nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.tar.lz nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.tar.xz nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.tar.zst nixlib-4cc5d222ce596fd79d9541c1eb7e7c2b0164bec3.zip | |
bochs: fix build with glibc 2.26
Tracking issue: #31696
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch | 14 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/bochs/default.nix | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch b/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch new file mode 100644 index 000000000000..a13b42ee35a3 --- /dev/null +++ b/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch @@ -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 diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 211bd2f39e08..4ad8f0213261 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; }; + patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; + buildInputs = with stdenv.lib; [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] @@ -107,6 +109,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + meta = { description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' |