From efc567b93dda995793482c26b1fa7823af6a381a Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Mon, 17 Mar 2025 23:27:47 -0400 Subject: Update --- deps/glfw-rs | 2 +- flake.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deps/glfw-rs b/deps/glfw-rs index 6b33eb6..1ce13a2 160000 --- a/deps/glfw-rs +++ b/deps/glfw-rs @@ -1 +1 @@ -Subproject commit 6b33eb6cca4dccea3da6ec1208206505694502e6 +Subproject commit 1ce13a2bcf3ef3bf6184bcb4c2a90d9034956841 diff --git a/flake.nix b/flake.nix index 82b3c74..eafa31d 100644 --- a/flake.nix +++ b/flake.nix @@ -139,13 +139,18 @@ }; windows = rec { + glfw = pkgs.pkgsCross.mingwW64.glfw.overrideAttrs (cur: prev: { + cmakeFlags = []; + env = {}; + postPatch = "true"; + }); shell = craneLib.devShell { packages = [ pkgs.pkgsCross.mingwW64.stdenv.cc pkgs.pkgsCross.mingwW64.windows.pthreads - pkgs.pkgsCross.mingwW64.glfw + glfw ]; - RUSTFLAGS="-L ${pkgs.pkgsCross.mingwW64.glfw}/bin"; + RUSTFLAGS="-L ${glfw}/lib"; }; build = path: nm: let -- cgit v1.2.3