add library as git submodule, wayland, window shows

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/RGFW"]
+	path = lib/RGFW
+	url = https://github.com/ColleagueRiley/RGFW

flake.nix

@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+    self.submodules = true;
   };
   outputs = {nixpkgs, ...}: let
     system = "x86_64-linux";
@@ -47,10 +48,6 @@
     ghcPackages = p: [
     ];
     buildDeps = [
-      pkgs.pkg-config
-      pkgs.wayland-protocols
-      pkgs.wayland-scanner
-
       pkgs.egl-wayland
       pkgs.libGL
       pkgs.libxkbcommon
@@ -60,6 +57,12 @@
       pkgs.xorg.libXi
       pkgs.xorg.libXrandr
     ];
+    runtimeDeps = [
+      pkgs.makeWrapper
+      pkgs.pkg-config
+      pkgs.wayland-protocols
+      pkgs.wayland-scanner
+    ];
   in {
     packages.${system} = {
       debug = pkgs.callPackage ./package.nix {
@@ -67,24 +70,28 @@
         haddockOptions = noHaddockOptions;
         inherit ghcPackages;
         inherit buildDeps;
+        inherit runtimeDeps;
       };
       release = pkgs.callPackage ./package.nix {
         ghcOptions = releaseGhcOptions;
         haddockOptions = noHaddockOptions;
         inherit ghcPackages;
         inherit buildDeps;
+        inherit runtimeDeps;
       };
       docs = pkgs.callPackage ./package.nix {
         ghcOptions = "--version";
         inherit haddockOptions;
         inherit ghcPackages;
         inherit buildDeps;
+        inherit runtimeDeps;
       };
       default = pkgs.callPackage ./package.nix {
         ghcOptions = releaseGhcOptions;
         inherit haddockOptions;
         inherit ghcPackages;
         inherit buildDeps;
+        inherit runtimeDeps;
       };
     };
   };

lib/RGFW_HS.h

@@ -0,0 +1,16 @@
+#ifndef RGFW_HS // avoid repeated imports
+#define RGFW_HS
+
+// TODO add actual include logic
+
+#define RGFW_IMPLEMENTATION
+#define RGFW_DEBUG
+#define RGFW_X11
+#define RGFW_WAYLAND
+#define RGFW_OPENGL
+
+#define Time X11Time // fixes namespace clash with GHC when building with Nix
+#include "RGFW/RGFW.h"
+#undef Time
+
+#endif RGFW_HS

package.nix

@@ -1,5 +1,6 @@
 {
   buildDeps,
+  runtimeDeps,
   haskellPackages,
   lib,
   pkgs,
@@ -9,7 +10,7 @@
   ghcPackages,
   ...
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "hs-rgfw";
   version = "0.1.0";
   src = ./.;
@@ -17,11 +18,11 @@ stdenv.mkDerivation {
     [
       (haskellPackages.ghcWithPackages ghcPackages)
     ]
-    ++ buildDeps;
+    ++ buildDeps ++ runtimeDeps;
   buildInputs =
     [
     ]
-    ++ buildDeps;
+    ++ runtimeDeps;
   configurePhase = ''
     export PKG_CONFIG_PATH=/run/current-system/sw/lib/pkgconfig
 
@@ -43,7 +44,7 @@ stdenv.mkDerivation {
   '';
   buildPhase = ''
     mkdir src/lib
-    cp lib/* src/lib/
+    cp -r lib/* src/lib/
     cp ccode/*.c ./
     ghc ${ghcOptions} ./src/Main.hs -o ./Main $(pkg-config --cflags --libs gl wayland-client wayland-egl wayland-cursor xkbcommon x11 xcursor xrandr xi) -I./headers/ $(ls *.c)
     mkdir ./docs
@@ -53,6 +54,7 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     cp ./Main $out/bin/hs-rgfw
     cp ./docs $out/docs -r
+    wrapProgram "$out/bin/${meta.mainProgram}" --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}"
   '';
 
   meta = {

src/Main.hs

@@ -21,25 +21,19 @@ main = do
                 800
                 600
                 $ mkWindowFlags 
-                  [ WindowCenter
+                  [ WindowNoResize
-                  , WindowNoResize
                   , WindowOpenGL
+                  , WindowFullscreen
                   ]
               )
-  let loop = do
+  let loop ctr = do
-        putStrLn $ show window
-        putStrLn
-          $ show
-            $ mkWindowFlags 
-              [ WindowCenter
-              , WindowNoResize
-              , WindowOpenGL
-              ]
         shouldClose <- rgfwWindowShouldClose window
-        if 0 == shouldClose
+        if 0 /= shouldClose
-        then return ()
+        then return shouldClose
-        else loop
+        else loop $ ctr + 1
-  loop
+  exitCode <- loop 0
+  putStrLn $ show exitCode
+  return ()
 
 --------------------------------------------------------------------------------
 -- Haskell-ier abstractions
@@ -107,15 +101,15 @@ type RGFWwindowFlags = Word32
 
 type RGFWbool = CUInt
 
-foreign import capi "lib/RGFW.h RGFW_createWindow" rgfwCreateWindow
+foreign import capi "lib/RGFW_HS.h RGFW_createWindow" rgfwCreateWindow
-  :: CString
+  :: Ptr CChar
-  -> Int32
+  -> CInt
-  -> Int32
+  -> CInt
-  -> Int32
+  -> CInt
-  -> Int32
+  -> CInt
   -> RGFWwindowFlags
   -> IO RGFWwindowPtr
 
-foreign import capi "lib/RGFW.h RGFW_window_shouldClose" rgfwWindowShouldClose
+foreign import capi "lib/RGFW_HS.h RGFW_window_shouldClose" rgfwWindowShouldClose
   :: RGFWwindowPtr
   -> IO RGFWbool