ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4275 from ambrop72/bossa-fix

Browse Source 
BOSSA: Try to fix a nondeterministic build failure.
This commit is contained in:
Domen Kožar 2014-09-26 09:04:50 +02:00
commit 8f1aade0ba
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch Normal file
View File

@ -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)

2
pkgs/development/tools/misc/bossa/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md"; sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
}; };
patches = [ ./bossa-no-applet-build.patch ];
nativeBuildInputs = [ bin2c ]; nativeBuildInputs = [ bin2c ];
buildInputs = [ wxGTK libX11 readline ]; buildInputs = [ wxGTK libX11 readline ];