Commit cfe77e5d authored by ners's avatar ners
Browse files

bossa: 1.8 -> 1.9.1

parent 406e1954
Loading
Loading
Loading
Loading
+0 −16
Original line number Diff line number Diff line
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 −4
Original line number Diff line number Diff line
@@ -15,17 +15,15 @@ let
in
stdenv.mkDerivation rec {
  pname = "bossa";
  version = "1.8";
  version = "1.9.1";

  src = fetchFromGitHub {
    owner = "shumatech";
    repo = "BOSSA";
    rev = version;
    sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y=";
    sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
  };

  patches = [ ./bossa-no-applet-build.patch ];

  nativeBuildInputs = [ bin2c ];
  buildInputs = [ wxGTK libX11 readline ];