diff --git a/.pick_status.json b/.pick_status.json
index bfeb3ca57a2..406eb063dff 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1034,7 +1034,7 @@
         "description": "lavapipe: build \"Windows\" check should use the host machine, not the `platforms` option.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e030ab51632d1de1859e4683ae0ff260a8d98a14",
         "notes": null
diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build
index 9b009e6a7e1..acbb3a1e924 100644
--- a/src/gallium/targets/lavapipe/meson.build
+++ b/src/gallium/targets/lavapipe/meson.build
@@ -16,7 +16,7 @@ libvulkan_lvp = shared_library(
 
 icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
 icd_file_name = 'libvulkan_lvp.so'
-if with_platform_windows
+if host_machine.system() == 'windows'
   icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
   icd_file_name = 'vulkan_lvp.dll'
 endif
@@ -27,7 +27,7 @@ icd_command = [
   '--lib-path', join_paths(icd_lib_path, icd_file_name),
   '--out', '@OUTPUT@',
 ]
-if with_platform_windows
+if host_machine.system() == 'windows'
   icd_command += '--use-backslash'
 endif