From e0f430cfb325c412e63cb49982151e8ded02c839 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Thu, 25 Sep 2014 22:48:42 +0200
Subject: [PATCH] BOSSA: Try to fix a nondeterministic build failure.

There's a Make rule to generate .cpp from .asm but the .cpp is included
in the source. Presumably the timestamps of these two files in the tmp
dir are different when Hydra is building, but not on my system. This
causes Make to try to rebuild .cpp, but the tools needed for that are missing.
---
 .../tools/misc/bossa/bossa-no-applet-build.patch | 16 ++++++++++++++++
 pkgs/development/tools/misc/bossa/default.nix    |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch

diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
new file mode 100644
index 000000000000..4284245f485d
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index cc8882e..97b11ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -184,11 +184,6 @@ $(foreach src,$(COMMON_SRCS),$(eval $(call common_obj,$(src))))
+ # Applet rules
+ #
+ define applet_obj
+-$(SRCDIR)/$(1:%.asm=%.cpp): $(SRCDIR)/$(1)
+-	@echo APPLET $(1:%.asm=%)
+-	$$(Q)$$(ARMAS) -o $$(@:%.o=%.obj) $$<
+-	$$(Q)$$(ARMOBJCOPY) -O binary $$(@:%.o=%.obj) $$(@:%.o=%.bin)
+-	$$(Q)appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR)
+ $(OBJDIR)/$(1:%.asm=%.o): $(SRCDIR)/$(1:%.asm=%.cpp)
+ 	@echo CPP APPLET $$<
+ 	$$(Q)$$(CXX) $$(COMMON_CXXFLAGS) -c -o $$(@) $$(<:%.asm=%.cpp)
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index f0b6d81e69eb..71148755a756 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
   };
 
+  patches = [ ./bossa-no-applet-build.patch ];
+
   nativeBuildInputs = [ bin2c ];
   buildInputs = [ wxGTK libX11 readline ];