mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #4275 from ambrop72/bossa-fix
BOSSA: Try to fix a nondeterministic build failure.
This commit is contained in:
commit
8f1aade0ba
@ -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)
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
|
||||
};
|
||||
|
||||
patches = [ ./bossa-no-applet-build.patch ];
|
||||
|
||||
nativeBuildInputs = [ bin2c ];
|
||||
buildInputs = [ wxGTK libX11 readline ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user