diff options
| -rw-r--r-- | pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch | 29 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/bochs/default.nix | 6 |
2 files changed, 34 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch b/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch new file mode 100644 index 0000000000000..167dd65d05b33 --- /dev/null +++ b/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch @@ -0,0 +1,29 @@ +------------------------------------------------------------------------ +r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines + +Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion). + + +Index: iodev/display/voodoo_data.h +=================================================================== +--- a/iodev/display/voodoo_data.h (revision 13881) ++++ b/iodev/display/voodoo_data.h (revision 13882) +@@ -1837,11 +1837,11 @@ + + /* fifo content defines */ + #define FIFO_TYPES (7 << 29) +-#define FIFO_WR_REG (1 << 29) +-#define FIFO_WR_TEX (2 << 29) +-#define FIFO_WR_FBI_32 (3 << 29) +-#define FIFO_WR_FBI_16L (4 << 29) +-#define FIFO_WR_FBI_16H (5 << 29) ++#define FIFO_WR_REG (1U << 29) ++#define FIFO_WR_TEX (2U << 29) ++#define FIFO_WR_FBI_32 (3U << 29) ++#define FIFO_WR_FBI_16L (4U << 29) ++#define FIFO_WR_FBI_16H (5U << 29) + + BX_CPP_INLINE void fifo_reset(fifo_state *f) + { + +------------------------------------------------------------------------ diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index f2418d80d2e49..3a8e9dc0bee7f 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; }; - patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ]; + patches = [ + ./bochs-2.6.11-glibc-2.26.patch + ./fix-build-smp.patch + ./bochs_fix_narrowing_conv_warning.patch + ]; buildInputs = [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] |