From 4f30ad9a54ff1533bbe9ec9c4302e4bfcce7b410 Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Mon, 17 Mar 2025 19:41:11 -0400 Subject: Statically link glfw --- deps/glfw-rs | 2 +- flake.lock | 6 +++--- flake.nix | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/deps/glfw-rs b/deps/glfw-rs index 8a0fb15..6b33eb6 160000 --- a/deps/glfw-rs +++ b/deps/glfw-rs @@ -1 +1 @@ -Subproject commit 8a0fb154f7ab6248276e6eafaf10ae157cdfda3e +Subproject commit 6b33eb6cca4dccea3da6ec1208206505694502e6 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; }; -- cgit v1.2.3