emulicious: init at 2024-05-31

bignaux · Jun 2, 2024 · 5cfe454 · 5cfe454
1 parent 7603c85
commit 5cfe454
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 43 deletions.
diff --git a/pkgs/emulicious/default.nix b/pkgs/emulicious/default.nix
@@ -1,49 +1,29 @@
-{ lib, stdenv, jre, makeWrapper, requireFile }:
+{ lib, stdenv, jre, makeWrapper, fetchzip, adoptopenjdk-jre-bin }:
 
 stdenv.mkDerivation rec {
   version = "2024-05-31";
   pname = "emulicious";
 
-  # src = fetchzip {
-  #   name = "${pname}-${version}.zip";
-  #   url = "https://emulicious.net/download/emulicious/?wpdmdl=205";
-  #   sha256 = "082jxhrd1zrxhkq6axww3nldrilf9hqfnn0i2syg4dqfl8jdmlg7";
-  # };
-
-  src = requireFile {
-    name = "emulicious.zip";
-    message = ''
-      This nix expression requires that emulicious.zip is
-      already part of the store. Find the file on ${meta.homepage}
-      and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
-    '';
-    sha256 = "082jxhrd1zrxhkq6axww3nldrilf9hqfnn0i2syg4dqfl8jdmlg7";
+  src = fetchzip {
+    name = "${pname}-${version}.zip";
+    url = "https://emulicious.net/emulicious/downloads/${pname}-${version}.zip";
+    sha256 = "sha256-VsEAzqB97puSvPg8CxZAdr9bP2K7jSy02haguWsP7Z0=";
+    stripRoot=false;
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-# see https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emulicious-bin
-
-  # installPhase = ''
-  #   runHook preInstall
-
-  #   mkdir -p $out/share/java
-  #   mv $(ls */*.jar) $out/share/java
-
-  #   makeWrapper $out/share/java/frostwire $out/bin/frostwire \
-  #     --prefix PATH : ${jre}/bin \
-  #     --prefix LD_LIBRARY_PATH : $out/share/java \
-  #     --set JAVA_HOME "${jre}"
-
-  #   substituteInPlace $out/share/java/frostwire \
-  #     --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \
-  #       "export JAVA_PROGRAM_DIR=${jre}/bin/"
-
-  #   substituteInPlace $out/share/java/frostwire.desktop \
-  #     --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U"
-
-  #   runHook postInstall
-  # '';
+  dontConfigure = true;
+  dontUnpack = true;
+  dontBuild = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -D $src/Emulicious.jar $out/lib/Emulicious.jar
+    makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/emulicious --add-flags "-jar $out/lib/Emulicious.jar"
+    runHook postInstall
+  '';
 
   meta = with lib; {
     broken = true;

diff --git a/pkgs/gbdk-2020-sdcc/default.nix b/pkgs/gbdk-2020-sdcc/default.nix
@@ -52,16 +52,21 @@ stdenv.mkDerivation (finalAttrs: {
   # see https://github.com/gbdk-2020/gbdk-2020-sdcc/blob/main/.github/workflows/sdcc_build.yml
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/sdcc/code/trunk";
-    rev = "14865";
-    sha256 = "sha256-YndxbmX2gKh7z926UKDfXgErfaNgDwn8Fx6oEL2Tevo=";
+    # rev = "14865";
+    # sha256 = "sha256-YndxbmX2gKh7z926UKDfXgErfaNgDwn8Fx6oEL2Tevo=";
+    rev = "14635";
+    sha256 = "sha256-qRvMD3La0b8c7C93ODocCtQe8KCJ89y+fJEqaoj4POw=";
   };
 
   patchFlags = [ "-p0" ];
   patches = [
 
     (fetchpatch {
-      url = "https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/patches/gbdk-4.3-nes_banked_nonbanked_no_overlay_locals_v8_combined.patch";
-      sha256 = "sha256-aLxtpMs5aVgCiJmV6CzwJuTUh5zP98E+t3HW5VvlWzA=";
+      # url = "https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/patches/gbdk-4.3-nes_banked_nonbanked_no_overlay_locals_v8_combined.patch";
+      # sha256 = "sha256-aLxtpMs5aVgCiJmV6CzwJuTUh5zP98E+t3HW5VvlWzA=";
+
+      url = "https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/patches/gbdk-4.3.0-nes_banked_nonbanked_no_overlay_locals_v7_combined.diff.patch";
+      sha256 = "1b0fzh83r70jd872rckj2iqmid7z3pklvmsfwgygjpy2z6phpk5l";
     })
   ];
 

diff --git a/pkgs/gbdk-2020/default.nix b/pkgs/gbdk-2020/default.nix
@@ -4,16 +4,30 @@
 , autoconf
 , gbdk-2020-sdcc
 , doxygen
+, excludePorts ? [
+    "nes"
+  ]
 }:
 
+assert lib.subtractLists [
+  "gb"
+  "ap"
+  "duck"
+  "gg"
+  "sms"
+  "msxdos"
+  "nes"
+]
+  excludePorts == [ ];
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "gbdk-2020";
   version = "4.2.0+git20240531";
 
   src = fetchgit {
     "url" = "https://github.com/gbdk-2020/gbdk-2020";
-    "rev" = "bfcbc153097bf0d6874568abff025713f812ed5e";
-    "hash" = "sha256-t5kCDeSMTT++IWqtJ4Myh+KT/J4ZS5FNuVj4HJwRKaA=";
+    "rev" = "4fb514b4d0d28ca093836e12278f9044c21864a0";
+    "hash" = "sha256-GBY3FJkQXoB2Uf9b6Eh4Qxn69+Opd3Bn6NJ1YnRzKq0=";
   };
 
   outputs = [ "out" ];