cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #76651 from AndersonTorres/update/bochs

Browse source 
Bochs: 2.6.9 -> 2.6.10
This commit is contained in:
Anderson Torres 2019-12-29 15:23:47 -03:00 committed by GitHub
commit fb19fad16c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch Normal file
View file

@ -0,0 +1,13 @@
diff -Naur bochs-2.6.10.orig/iodev/network/slirp/slirp.h bochs-2.6.10.mod/iodev/network/slirp/slirp.h
--- bochs-2.6.10.orig/iodev/network/slirp/slirp.h 2019-11-02 16:30:39.843938000 -0300
+++ bochs-2.6.10.mod/iodev/network/slirp/slirp.h 2019-12-29 12:55:49.541630697 -0300
@@ -44,8 +44,8 @@
#endif
#include <sys/types.h>
-#if defined(__OpenBSD__) || defined(__linux__)
#include <stdint.h>
+#if defined(__OpenBSD__) || defined(__linux__)
#include <sys/wait.h>
#endif
#ifdef HAVE_SYS_BITYPES_H

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

@ -1,14 +0,0 @@
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

8
pkgs/applications/virtualization/bochs/default.nix
View file

@ -19,14 +19,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "bochs";
version = "2.6.9";
version = "2.6.10";
src = fetchurl {
url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
sha256 = "1c3mw4b8wrjf8z44fvhycs95j1wd1c0b4khcv63giiia5j5q0gvj";
};
patches = [ ./bochs-2.6.9-glibc-2.26.patch ];
patches = [ ./bochs-2.6.10-glibc-2.26.patch ];
buildInputs = with stdenv.lib;
[ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://bochs.sourceforge.net/;
license = licenses.lgpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}