diff options
| author | Domen Kožar <domen@dev.si> | 2014-09-26 09:04:50 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-09-26 09:04:50 +0200 |
| commit | 8f1aade0ba0b1d02819a0cc653fbaaeb1452b941 (patch) | |
| tree | 030a6f2214a9ce7628d1c004033477fda2e15252 /pkgs/development | |
| parent | 2907d31248f97859318dfff17c788967beef7ac6 (diff) | |
| parent | e0f430cfb325c412e63cb49982151e8ded02c839 (diff) | |
| download | nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.tar nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.tar.gz nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.tar.bz2 nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.tar.lz nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.tar.xz nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.tar.zst nixlib-8f1aade0ba0b1d02819a0cc653fbaaeb1452b941.zip | |
Merge pull request #4275 from ambrop72/bossa-fix
BOSSA: Try to fix a nondeterministic build failure.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch | 16 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/bossa/default.nix | 2 |
2 files changed, 18 insertions, 0 deletions
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 ]; |