From 7d2f87d3e9e9f264b669aaf00c2c86c10af82d74 Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Mon, 17 Mar 2025 23:34:00 -0400 Subject: Update --- flake.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index eafa31d..3d6247f 100644 --- a/flake.nix +++ b/flake.nix @@ -146,7 +146,7 @@ }); shell = craneLib.devShell { packages = [ - pkgs.pkgsCross.mingwW64.stdenv.cc + pkgs.pkgsCross.mingwW64.buildPackages.gcc pkgs.pkgsCross.mingwW64.windows.pthreads glfw ]; @@ -169,14 +169,11 @@ strictDeps = true; CARGO_BUILD_TARGET = "x86_64-pc-windows-gnu"; CARGO_BUILD_RUSTFLAGS="-L ${pkgs.pkgsCross.mingwW64.glfw}/bin"; - TARGET_CC = "${pkgs.pkgsCross.mingwW64.stdenv.cc}/bin/${pkgs.pkgsCross.mingwW64.stdenv.cc.targetPrefix}cc"; CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER = "${pkgs.pkgsCross.mingwW64.stdenv.cc}/bin/${pkgs.pkgsCross.mingwW64.stdenv.cc.targetPrefix}cc"; - OPENSSL_DIR = "${pkgs.openssl.dev}"; - OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; - OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include/"; depsBuildBuild = with pkgs; [ - pkgsCross.mingwW64.stdenv.cc + pkgsCross.mingwW64.buildPackages.gcc pkgsCross.mingwW64.windows.pthreads + glfw ]; inherit (craneLib.crateNameFromCargoToml { inherit src; }) version; }; -- cgit v1.2.3