feat(#34): raygui nix support, raygui example

.gitignore

@@ -1,4 +1,12 @@
+# Cabal output
 dist-newstyle/
+
+# Nix output
+result
+
+# Miscellaneous development files (scratch files)
 other/
+
+# IDE files
 .vscode/
 hie.yaml

default.nix

@@ -1,5 +1,5 @@
-{ mkDerivation, base, containers, exceptions, lens, lib, libGL
-, libX11, libXcursor, libXext, libXi, libXinerama, libXrandr, raylib, ...
+{ mkDerivation, base, containers, exceptions, lens, template-haskell, text, bytestring
+, lib, libGL, libX11, libXcursor, libXext, libXi, libXinerama, libXrandr, raylib, raygui, ...
 }:
 mkDerivation {
   pname = "h-raylib";
@@ -8,11 +8,19 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   configureFlags = [
-    "-fplatform-nixos"
+    "-f-detect-platform -fplatform-nixos"
   ];
-  libraryHaskellDepends = [ base containers exceptions lens ];
+  libraryHaskellDepends = [ base containers exceptions lens template-haskell text bytestring ];
   librarySystemDepends = [
-    libGL libX11 libXcursor libXext libXi libXinerama libXrandr raylib
+    libGL
+    libX11
+    libXcursor
+    libXext
+    libXi
+    libXinerama
+    libXrandr
+    raylib
+    raygui
   ];
   description = "Raylib bindings for Haskell";
   license = lib.licenses.asl20;

default.nix.template

@@ -1,5 +1,5 @@
-{ mkDerivation, base, containers, exceptions, lens, lib, libGL
-, libX11, libXcursor, libXext, libXi, libXinerama, libXrandr, raylib, ...
+{ mkDerivation, base, containers, exceptions, lens, template-haskell, text, bytestring
+, lib, libGL, libX11, libXcursor, libXext, libXi, libXinerama, libXrandr, raylib, raygui, ...
 }:
 mkDerivation {
   pname = "h-raylib";
@@ -8,11 +8,19 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   configureFlags = [
-    "-fplatform-nixos"
+    "-f-detect-platform -fplatform-nixos"
   ];
-  libraryHaskellDepends = [ base containers exceptions lens ];
+  libraryHaskellDepends = [ base containers exceptions lens template-haskell text bytestring ];
   librarySystemDepends = [
-    libGL libX11 libXcursor libXext libXi libXinerama libXrandr raylib
+    libGL
+    libX11
+    libXcursor
+    libXext
+    libXi
+    libXinerama
+    libXrandr
+    raylib
+    raygui
   ];
   description = "Raylib bindings for Haskell";
   license = lib.licenses.asl20;

devtools.js

@@ -145,23 +145,31 @@ if (process.argv.includes("-u") || process.argv.includes("--nix-update")) {
     log(logLevel.INFO, "Using nix path: " + nixPath);
     log(logLevel.INFO, "Using git path: " + gitPath);
 
-    log(logLevel.VERB, "Fetching git revision");
+    log(logLevel.VERB, "Fetching git revisions");
 
-    const gitOutput = exec(`cd raylib && ${gitPath} rev-parse HEAD`);
-    const revision = gitOutput.split("\n")[0];
+    const raylibGitOutput = exec(`cd raylib && ${gitPath} rev-parse HEAD`);
+    const raylibRevision = raylibGitOutput.split("\n")[0];
+
+    log(logLevel.VERB, "Found raylib revision: " + raylibRevision);
+
+    const rayguiGitOutput = exec(`cd raygui && ${gitPath} rev-parse HEAD`);
+    const rayguiRevision = rayguiGitOutput.split("\n")[0];
+
+    log(logLevel.VERB, "Found raygui revision: " + rayguiRevision);
 
-    log(logLevel.VERB, "Found revision: " + revision);
-    log(logLevel.VERB, "Fetching h-raylib version");
     log(logLevel.INFO, "h-raylib version " + hraylibVersion);
 
-    const flakeUpdated = readFileSync(
+    const flakeNixRaw = readFileSync(
       path.join(__dirname, "flake.nix")
-    ).includes(revision);
+    );
+
+    const flakeUpdatedRaylib = flakeNixRaw.includes(`rev = "${raylibRevision}"`);
+    const flakeUpdatedRaygui = flakeNixRaw.includes(`rev = "${rayguiRevision}"`);
     const defaultUpdated = readFileSync(
       path.join(__dirname, "default.nix")
-    ).includes(hraylibVersion);
+    ).includes(`version = "${hraylibVersion}"`);
 
-    if (flakeUpdated && defaultUpdated) {
+    if (flakeUpdatedRaylib && flakeUpdatedRaygui && defaultUpdated) {
       log(logLevel.INFO, "The flake is already up to date");
       process.exitCode = 0;
       return;
@@ -173,12 +181,17 @@ if (process.argv.includes("-u") || process.argv.includes("--nix-update")) {
       force: true
     });
 
-    if (!flakeUpdated) {
+    if (!flakeUpdatedRaylib || !flakeUpdatedRaygui) {
       log(logLevel.INFO, "Prefetching with nix, this might take a while");
 
-      const { hash } = JSON.parse(
+      const { raylibHash } = JSON.parse(
+        exec(
+          `${nixPath} flake prefetch github:raysan5/raylib/${raylibRevision} --extra-experimental-features nix-command --extra-experimental-features flakes --json`
+        )
+      );
+      const { rayguiHash } = JSON.parse(
         exec(
-          `${nixPath} flake prefetch github:raysan5/raylib/${revision} --extra-experimental-features nix-command --extra-experimental-features flakes --json`
+          `${nixPath} flake prefetch github:raysan5/raygui/${rayguiRevision} --extra-experimental-features nix-command --extra-experimental-features flakes --json`
         )
       );
 
@@ -193,8 +206,10 @@ if (process.argv.includes("-u") || process.argv.includes("--nix-update")) {
         path.join(__dirname, "flake.nix.template")
       )
         .toString()
-        .replace("REVISION", revision)
-        .replace("HASH", hash);
+        .replace("RAYLIB_REVISION", raylibRevision)
+        .replace("RAYLIB_HASH", raylibHash)
+        .replace("RAYGUI_REVISION", rayguiRevision)
+        .replace("RAYGUI_HASH", rayguiHash);
       writeFileSync(path.join(__dirname, "flake.nix"), flakeTemplate);
 
       log(logLevel.INFO, "Successfully updated flake.nix");
@@ -239,7 +254,7 @@ if (process.argv.includes("-u") || process.argv.includes("--nix-update")) {
 ) {
   diffWithRemote("raylib");
 } else if (
-  process.argv.includes("-g") ||
+  process.argv.includes("-gd") ||
   process.argv.includes("--raygui-diff")
 ) {
   diffWithRemote("raygui");
@@ -316,7 +331,8 @@ This script contains useful tools for h-raylib development
     --raylib-diff
     --nix-update
 
-    --raygui-diff     Diff the local raygui source with the latest remote code
+    -gd               Diff the local raygui source with the latest remote code
+    --raygui-diff
 
     -p                Package the cabal project and run the examples
     --package

examples/raygui-suite/src/Main.hs

@@ -0,0 +1,28 @@
+{-# OPTIONS -Wall #-}
+module Main where
+
+import Raylib.Core (clearBackground)
+import Raylib.Core.Text (drawText)
+import Raylib.Util (drawing, whileWindowOpen_, withWindow)
+import Raylib.Util.Colors (lightGray, rayWhite)
+import Raylib.Util.GUI (guiLabel, guiSetStyleTextSize)
+import Raylib.Types (Rectangle (Rectangle))
+
+main :: IO ()
+main = do
+  withWindow
+    1000
+    800
+    "raylib [raygui] test suite"
+    60
+    ( \_ -> do
+        guiSetStyleTextSize 20
+        whileWindowOpen_
+          ( \_ -> drawing
+              ( do
+                  clearBackground rayWhite
+
+                  guiLabel (Rectangle 20 20 200 20) "raygui test suite"
+              ) >> return ()
+          ) ()
+    )

flake.nix

@@ -17,16 +17,26 @@
             (self: super: {
               raylib = super.raylib.overrideAttrs (old: {
                 patches = [];
+                version = "5.0.0";
                 src = self.fetchFromGitHub {
                   owner = "raysan5";
                   repo = "raylib";
                   rev = "40f3df5b865eee0cd87a9e4e1347cb04c87841f8";
                   sha256 = "sha256-yJndpOz1DM9jmroZf5A+82uZ8f6TM+Qraidc9qetvbc=";
                 };
-                postFixup = ''
-                  cp ../src/*.h $out/include/
-                '';
+                postFixup = "cp ../src/*.h $out/include/";
               });
+              raygui = super.stdenv.mkDerivation { # A bit of a hack to get raygui working
+                name = "raygui";
+                src = self.fetchFromGitHub {
+                  owner = "raysan5";
+                  repo = "raygui";
+                  rev = "45e7f967e62088b9fec02ac38c07d4b67d6466b0";
+                  sha256 = "sha256-rt3W8hVAnq4WCnnMFj4sVOq0UjlkglHTKvtMye4w+TA=";
+                };
+                nativeBuildInputs = [];
+                postFixup = "mkdir -p $out/include/ && cp ./src/raygui.h $out/include/";
+              };
             })
           ]; 
         };
@@ -43,7 +53,6 @@
                   buildInputs = with pkgs; [
                     stdenv.cc
                     ghc
-
                     glfw
                     cabal-install
                     xorg.libXinerama
@@ -52,6 +61,7 @@
                     xorg.libXi
                     xorg.libXext
                     raylib
+                    raygui
                   ];
                 };
             }

flake.nix.template

@@ -17,16 +17,26 @@
             (self: super: {
               raylib = super.raylib.overrideAttrs (old: {
                 patches = [];
+                version = "5.0.0";
                 src = self.fetchFromGitHub {
                   owner = "raysan5";
                   repo = "raylib";
-                  rev = "REVISION";
-                  sha256 = "HASH";
+                  rev = "RAYLIB_REVISION";
+                  sha256 = "RAYLIB_HASH";
                 };
-                postFixup = ''
-                  cp ../src/*.h $out/include/
-                '';
+                postFixup = "cp ../src/*.h $out/include/";
               });
+              raygui = super.stdenv.mkDerivation { # A bit of a hack to get raygui working
+                name = "raygui";
+                src = self.fetchFromGitHub {
+                  owner = "raysan5";
+                  repo = "raygui";
+                  rev = "RAYGUI_REVISION";
+                  sha256 = "RAYGUI_HASH";
+                };
+                nativeBuildInputs = [];
+                postFixup = "mkdir -p $out/include/ && cp ./src/raygui.h $out/include/";
+              };
             })
           ]; 
         };
@@ -43,7 +53,6 @@
                   buildInputs = with pkgs; [
                     stdenv.cc
                     ghc
-
                     glfw
                     cabal-install
                     xorg.libXinerama
@@ -52,6 +61,7 @@
                     xorg.libXi
                     xorg.libXext
                     raylib
+                    raygui
                   ];
                 };
             }

h-raylib.cabal

@@ -32,6 +32,7 @@ extra-source-files:
   raylib/**/*.c
   raylib/**/*.h
   raylib/**/*.m
+  raygui/src/*.h
 
 source-repository head
   type:     git
@@ -170,6 +171,12 @@ executable basic-rlgl
   hs-source-dirs: examples/basic-rlgl/src
   main-is:        Main.hs
 
+-- raygui
+executable raygui-suite
+  import:         example-options
+  hs-source-dirs: examples/raygui-suite/src
+  main-is:        Main.hs
+
 library
   exposed-modules:
     Raylib.Core
@@ -201,8 +208,8 @@ library
     , exceptions        >=0.10.4   && <0.10.8
     , lens              >=4.0      && <5.2.4
     , template-haskell  >=2.17.0.0 && <2.22.0.0
-    , text
-    , bytestring
+    , text              >=2.0      && <2.2
+    , bytestring        >=0.11.0   && <0.13
 
   hs-source-dirs:   src
   default-language: Haskell2010
@@ -236,7 +243,7 @@ library
       if impl(ghc <9.4.1)
         extra-libraries: gcc_eh
 
-  elif (flag(platform-linux) || (flag(detect-platform) && os(linux)))
+  elif ((flag(platform-linux) || (flag(detect-platform) && os(linux))) || flag(platform-nixos))
     extra-libraries:
       GL
       c
@@ -262,7 +269,7 @@ library
       pthread
 
   elif flag(platform-nixos)
-    pkgconfig-depends: raylib
+    pkgconfig-depends: raylib, raygui
 
   else
 

run-all-examples.sh

@@ -14,7 +14,7 @@ then
   then
     cabal clean
   fi
-  cabal build -j
+  cabal build all -j
 fi
 
 # core
@@ -41,3 +41,6 @@ cabal run basic-audio
 
 # rlgl
 cabal run basic-rlgl
+
+# raygui
+cabal run raygui-suite