feat: attempting to get windows to work again

enqy · Dec 3, 2023 · 2350e74 · 2350e74
1 parent 3132ecd
commit 2350e74
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 79 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -31,7 +31,6 @@
       url = "github:ipetkov/crane";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
       };
     };
 
@@ -89,9 +88,9 @@
             for arg in "$@"; do
               case "$arg" in
                 *compiler_builtins*)
-                  if [[ "$ZIG_CC_TARGET" != "x86_64-windows-gnu" ]]; then
-                    args+=("$arg")
-                  fi
+                  # if [[ "$ZIG_CC_TARGET" != "x86_64-windows-gnu" ]]; then
+                  args+=("$arg")
+                  # fi
                 ;;
                 -lwindows) ;;
                 -l:libpthread.a) ;;

diff --git a/nix/wgpu-native/default.nix b/nix/wgpu-native/default.nix
@@ -47,7 +47,7 @@ in
       # doesn't work when building for darwin from a non-darwin host
       # also doesn't work when building for wasm
       # also doesn't work here when building for MinGW
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWasm && !stdenv.hostPlatform.isMinGW) [
+      ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWasm) [
         rustPlatform.bindgenHook
       ];