Statically link glfw

3 files changed, 11 insertions, 4 deletions

diff --git a/deps/glfw-rs b/deps/glfw-rs
-Subproject 8a0fb154f7ab6248276e6eafaf10ae157cdfda3
+Subproject 6b33eb6cca4dccea3da6ec1208206505694502e
diff --git a/flake.lock b/flake.lock
index 060f22e..f7cd209 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7fa86de..1226a65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,13 +27,17 @@
       };
       craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchainFor;
 
+      glfw = pkgs.glfw.overrideAttrs (cur: prev: {
+        cmakeFlags = [];
+      });
+
       native = rec {
         nativeBuildInputs = [
           pkgs.pkg-config
         ];
         buildInputs = [
           pkgs.openssl.dev
-          pkgs.glfw
+          glfw
           pkgs.xorg.libX11 
           pkgs.xorg.libXcursor 
           pkgs.xorg.libXi 
@@ -130,9 +134,12 @@
           pkgs.glxinfo
           pkgs.cmake
         ] ++ native.nativeBuildInputs ++ native.buildInputs;
+        LIBRARY_PATH = "$LIBRARY_PATH:${pkgs.lib.makeLibraryPath native.buildInputs}";
+        RUSTFLAGS="-L ${glfw}/lib";
         LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${pkgs.lib.makeLibraryPath native.buildInputs}";
       };
     in {
+      packages.${system}.glfw = glfw;
       inherit shell native wasm;
       devShells.${system}.default = shell;
     };