working Heaps Game on MacOS

MadMcCrow · Jul 6, 2024 · 59c1434 · 59c1434
1 parent 3ad0e59
commit 59c1434
Show file tree

Hide file tree

Showing 20 changed files with 78 additions and 99 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -42,11 +42,6 @@
       url = "github:HeapsIO/heaps";
       flake = false;
     };
-    # formatter
-    formatter = {
-      url = "github:HaxeCheckstyle/haxe-formatter";
-      flake = false;
-    };
     # raylib source code
     raylib = {
       url = "github:Raysan5/raylib?ref=refs/tags/5.0";
@@ -76,6 +71,7 @@
           demos = pkgs.callPackage ./demo ({ inherit inputs; } // packages);
         in {
           legacyPackages."${system}" = packages // demos;
+          devShell."${system}" = pkgs.callPackage ./pkgs/shell.nix packages;
           # checks."${system}" = demos;
           # TODO : checks and dev shell
         };

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -3,10 +3,10 @@
 builtins.foldl' (x: y: lib.recursiveUpdate x (y (x // { inherit inputs; }))) { }
 (map (x: (args: callPackage x args)) [
   ./haxe
+  ./hxcpp
   ./format
   ./hashlink
   ./heaps
-  ./hxcpp
   ./dox
   ./haxefmt
   ./raylib

diff --git a/pkgs/dox/generic.nix b/pkgs/dox/generic.nix
@@ -1,6 +1,6 @@
 { version, inputs, lib, haxe, ... }:
 haxe.buildHaxelib {
-  libname = "dox";
+  pname = "dox";
   inherit version;
   src = inputs.dox;
   meta = {

diff --git a/pkgs/hashlink/default.nix b/pkgs/hashlink/default.nix
@@ -2,20 +2,11 @@
 #   hashlink-latest is a virtual machine that can be targeted
 #   when building haxe code
 { stdenv, buildEnv, callPackage, inputs, haxe, ... }@args:
-let
-  version = "1.14";
-  # hashlink-latest is different depending on the platform
-  hl = (if stdenv.isDarwin then
-    callPackage ./hl-darwin.nix
-  else
-    callPackage ./hl.nix) (args // { inherit version; });
-in {
-  hashlink = hl;
-  #buildEnv {
-  #name = "hashlink-latest";
-  #paths = [
-#    (import ./hlsdl { inherit haxe hl; })
-#    (import ./hlopenal { inherit haxe hl; })
-#  ];
-#};
+let version = "1.14";
+in rec {
+  # three packages 
+  hashlink = callPackage (if stdenv.isDarwin then ./hl-darwin.nix else ./hl.nix)
+    (args // { inherit version; });
+  hlsdl = callPackage ./hlsdl.nix (args // { inherit haxe hashlink; });
+  hlopenal = callPackage ./hlopenal.nix (args // { inherit haxe hashlink; });
 }
diff --git a/pkgs/hashlink/hl-darwin.nix b/pkgs/hashlink/hl-darwin.nix
@@ -10,16 +10,16 @@ let
       builtins.concatStringsSep "," (map (x: "${x}/${dir}") objc);
   in [ "CPATH=${concatObjc "include"}" "LIBRARY_PATH=${concatObjc "lib"}" ];
   # emulation for m1 macOS
-  pkgs_eml = import inputs.nixpkgs { system = "x86_64-darwin";  };
+  pkgs_eml = import inputs.nixpkgs { system = "x86_64-darwin"; };
   # implementation :
-in pkgs_eml.hashlink.overrideAttrs (finalAttrs : previousAttrs: {
+in pkgs_eml.hashlink.overrideAttrs (finalAttrs: previousAttrs: {
   inherit version;
   src = inputs.hashlink;
   buildInputs = previousAttrs.buildInputs ++ [ libpng ] ++ objc;
   makeFlags = previousAttrs.makeFlags ++ ObjCmakeFlags;
-   postFixup = previousAttrs.postFixup + ''
-  #   install_name_tool -add_rpath $out/lib $out/bin/hl
-  # '';
+  postFixup = previousAttrs.postFixup + ''
+    #   install_name_tool -add_rpath $out/lib $out/bin/hl
+    # '';
   postInstall = ''
     ${haxe.installHaxelib {
       pname = "${finalAttrs.pname}";

diff --git a/pkgs/hashlink/hlopenal.nix b/pkgs/hashlink/hlopenal.nix
@@ -1,8 +1,11 @@
-# openal library for hashlink-latest
-{ haxe, hl }:
+# openal library for hashlink
+{ haxe, hashlink, ... }:
 haxe.buildHaxelib {
-  version = hl.version;
-  pname = "openal";
-  src = "${hl.src}/libs/openal";
-  meta = hl.meta // { description = "openal support for hashlink-latest"; };
+  version = hashlink.version;
+  pname = "hlopenal";
+  src = "${hashlink.src}/libs/openal";
+  meta = {
+    inherit (hashlink.meta) license homepage;
+    description = "openal support for hashlink";
+  };
 }
diff --git a/pkgs/hashlink/hlsdl.nix b/pkgs/hashlink/hlsdl.nix
@@ -1,8 +1,11 @@
 # HLSDL library for hl
-{ haxe, hl }:
+{ haxe, hashlink, ... }:
 haxe.buildHaxelib {
-  version = hl.version;
+  version = hashlink.version;
   pname = "hlsdl";
-  src = "${hl.src}/libs/sdl";
-  meta = hl.meta // { description = "sdl2 support for hl"; };
+  src = "${hashlink.src}/libs/sdl";
+  meta = {
+    inherit (hashlink.meta) license homepage;
+    description = "sdl2 support for hashlink";
+  };
 }
diff --git a/pkgs/haxe/default.nix b/pkgs/haxe/default.nix
@@ -4,6 +4,5 @@
 let
   haxe = callPackage ./generic.nix {
     version = "4.3.4"; # using something else than a number may break packages
-    src = inputs.haxe;
   };
 in { haxe = haxe // (callPackage ./lib.nix { inherit haxe; }); }
diff --git a/pkgs/haxe/generic.nix b/pkgs/haxe/generic.nix
@@ -3,8 +3,8 @@
 { version, src, stdenv, lib, fetchurl, haxe, ocaml-ng, zlib, pcre2, neko
 , mbedtls_2, darwin, ... }:
 haxe.overrideAttrs (previousAttrs: {
-  inherit version src;
-  buildInputs = [ zlib pcre2 neko mbedtls_2 ]
+  inherit version;
+  buildInputs = previousAttrs.buildInputs ++ [ zlib pcre2 neko mbedtls_2 ]
     ++ (with ocaml-ng.ocamlPackages_4_14; [
       ocaml
       findlib

diff --git a/pkgs/haxefmt/default.nix b/pkgs/haxefmt/default.nix
@@ -1,9 +1,11 @@
-{ callPackage, writeShellApplication, inputs, haxe, ... }: rec {
-  formatter = callPackage ./generic.nix {
-    inherit haxe;
-    src = inputs.formatter;
-    version = "1.15.0";
-  };
+{ callPackage, fetchFromGitHub, writeShellApplication, inputs, haxe, ...
+}@args: rec {
+  # haxelib :
+  formatter = callPackage ./generic.nix (args // rec {
+    version = "1.16.0";
+    sha256 = "sha256-1m4jtZn38dJplH+qG2izirxkn4Cc9pAxv01lJZetd8I=";
+  });
+
   # command to run in a shell-env
   haxefmt = writeShellApplication {
     name = "haxefmt";

diff --git a/pkgs/haxefmt/generic.nix b/pkgs/haxefmt/generic.nix
@@ -1,7 +1,7 @@
-{ lib, haxe, src, version, ... }:
+{ lib, src, haxe, version, ... }:
 haxe.buildHaxelib {
   inherit src version;
-  pname = "haxe-formatter";
+  pname = "formatter";
   meta = {
     homepage = "https://github.com/HaxeCheckstyle/haxe-formatter";
     description = "A Haxe tool to format haxe code";

diff --git a/pkgs/heaps/default.nix b/pkgs/heaps/default.nix
@@ -1,9 +1,9 @@
 # heaps/default.nix
 # heaps.io is a "game engine" written in haxe
-{ callPackage, inputs, hashlink, ... }@args:
+{ callPackage, inputs, ... }@args:
 let
   heaps = callPackage ./generic.nix (args // {
     src = inputs.heaps;
     version = "2.0.0";
   });
-in { heaps = heaps // (callPackage ./lib.nix (args // {inherit heaps;})); }
+in { heaps = heaps // (callPackage ./lib.nix (args // { inherit heaps; })); }
diff --git a/pkgs/heaps/generic.nix b/pkgs/heaps/generic.nix
@@ -1,10 +1,11 @@
 # heaps/generic.nix
 # Build heaps games with nix 
 # TODO : remove function mkGame from module (move to separate "lib" module)
-{ src, version, haxePackages, haxe, format, hashlink, SDL2, openal, ... }:
+{ src, version, haxePackages, haxe, format, hashlink, hlsdl, hlopenal, SDL2
+, openal, ... }:
 haxe.buildHaxelib {
   inherit src version;
   pname = "heaps";
-  buildInputs = [ format hashlink SDL2 openal ];
+  buildInputs = [ format hashlink SDL2 openal hlsdl hlopenal ];
   meta = haxePackages.heaps.meta;
 }
diff --git a/pkgs/heaps/lib.nix b/pkgs/heaps/lib.nix
@@ -1,16 +1,16 @@
 # heaps/lib.nix
 # command to simplify building heaps games on nix
-{ lib, stdenv, haxe, hashlink, heaps, ... }: {
-  buildHeapsGame =
-    { compileHxml ? "compile.hxml", ... }@args:
+{ lib, stdenv, haxe, format, hashlink, hlopenal, hlsdl, heaps, ... }: {
+  buildHeapsGame = { compileHxml ? "compile.hxml", ... }@args:
     let
       name = args.pname or args.name;
       # disable HL/C on MacOS M1
       DoHLC = if stdenv.isDarwin then "false" else "true";
     in stdenv.mkDerivation (args // {
       # build inputs
       buildInputs = (args.buildInputs or [ ]);
-      nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [haxe hashlink heaps];
+      nativeBuildInputs = (args.nativeBuildInputs or [ ])
+        ++ [ haxe format hashlink hlopenal hlsdl heaps ];
       # copy source and the hxml
       unpackPhase = ''
         cp -r $src/* ./
@@ -20,8 +20,6 @@
         ${haxe}/bin/haxe ${compileHxml}
         OUTHL=$(cat ${compileHxml} | grep '^-hl *[[:graph:]]*.hl' || true)
         OUTHL=$(echo $OUTHL | sed 's/-hl[[:space:]]*//g')
-        ls -la ./build
-        edefe
         OUTC=$(cat ${compileHxml} | grep '^-hl *[[:graph:]]*.c' || true)
         OUTC=$(echo $OUTC | sed 's/-hl[[:space:]]*//g')
         # build HL/C
@@ -38,14 +36,10 @@
         mkdir -p $out/bin $out/lib
         # hl bytecode
         echo $OUTHL
-        ls -la build
-        defef
         if [ -f "$OUTHL" ]; then
         cp $OUTHL $out/lib/$(basename $OUTHL)
         echo "${hashlink}/bin/hl $out/lib/$(basename $OUTHL)" > $out/bin/${name};
         chmod +x $out/bin/${name};
-        ls $out/bin -la
-        efergdtg
         fi
         # native C
         if [ -f "$OUTC" ] && ${DoHLC}; then

diff --git a/pkgs/raylib/default.nix b/pkgs/raylib/default.nix
@@ -1,10 +1,16 @@
 # hxcpp/default.nix
 # hxcpp is the cpp exporter for haxe 
-{ callPackage, inputs, ... }:
+{ callPackage, inputs, haxe, ... }:
 let
-  raylib = callPackage ./raylib.nix { inherit inputs; };
-  raylib-hx = callPackage ./raylib-hx.nix { inherit inputs raylib; };
-  lib = callPackage ./lib.nix { inherit inputs raylib raylib-hx; };
+  raylib = callPackage ./raylib.nix {
+    inherit inputs;
+    version = "5.0";
+  };
+  raylib-hx = callPackage ./raylib-hx.nix {
+    inherit inputs raylib haxe;
+    version = "5.0.0";
+  };
+  lib = callPackage ./lib.nix { inherit inputs raylib raylib-hx haxe; };
 in {
   inherit raylib;
   raylib-hx = raylib-hx // lib;

diff --git a/pkgs/raylib/lib.nix b/pkgs/raylib/lib.nix
@@ -1,13 +1,13 @@
-{ raylib, raylib-hx, haxe, ... }: {
+{ stdenv, raylib, raylib-hx, haxe, ... }: {
   buildRaylibHxGame = { src, buildHxml ? "Build.hxml", ... }@args:
-    pkgs.stdenv.mkDerivation ({
+    stdenv.mkDerivation ({
       inherit src;
       unpackPhase = ''
         cp -r $src/* ./
       '';
       # build with haxe compiler
       buildPhase = ''
-        ${haxe}/bin/haxe ${compileHxml}
+        ${haxe}/bin/haxe ${buildHxml}
       '';
     } // args);
 }
diff --git a/pkgs/raylib/raylib-hx.nix b/pkgs/raylib/raylib-hx.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation {
       fi
       ${
         haxe.installHaxelib {
-          libname = "raylib-hx";
+          pname = "raylib-hx";
           files = "*";
           inherit version;
         }

diff --git a/pkgs/raylib/raylib.nix b/pkgs/raylib/raylib.nix
@@ -1,8 +1,7 @@
 # raylib/raylib.nix
 # raylib source code for raylib-hx
-{ raylib, inputs, ... }: {
-  raylib = raylib.overrideAttrs (previousAttrs: {
-    version = "5.0";
-    src = inputs.raylib;
-  });
-}
+{ raylib, inputs, ... }:
+raylib.overrideAttrs (previousAttrs: {
+  version = "5.0";
+  src = inputs.raylib;
+})
diff --git a/pkgs/shell.nix b/pkgs/shell.nix
@@ -1,18 +1,20 @@
 # make shell with every thing
-{ mkShell, haxe, hashlink-latest, format, hxcpp, heaps, formatter, haxefmt, dox, raylib
-, raylib-hx, neko, ... }:
+{ mkShell, haxe, format, hxcpp, hashlink, hlsdl, hlopenal, heaps, formatter
+, haxefmt, dox, raylib, raylib-hx, neko, ... }:
 mkShell {
   buildInputs = [
     haxe
-    hashlink-latest
-    format
+    neko
     hxcpp
+    format
+    hashlink
+    hlsdl
+    hlopenal
     heaps
     formatter
     haxefmt
     dox
     raylib
     raylib-hx
-    neko
   ];
 }