diff --git a/.pick_status.json b/.pick_status.json
index a0d7454af4b..a3bf13a7f0d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3307,7 +3307,7 @@
         "description": "anv: fixup invalid enum for nir environment",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8c4c4c3ee1a24b73fa29f30a05e873e9e13dddc7"
     },
diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c
index 0c162a41065..e3894df6a42 100644
--- a/src/intel/vulkan/anv_pipeline_cache.c
+++ b/src/intel/vulkan/anv_pipeline_cache.c
@@ -446,13 +446,13 @@ anv_load_fp64_shader(struct anv_device *device)
          .int16 = true,
          .int64 = true,
       },
-      .environment = MESA_SHADER_VERTEX,
+      .environment = NIR_SPIRV_VULKAN,
       .create_library = true
    };
 
    nir_shader* nir =
       spirv_to_nir(float64_spv_source, sizeof(float64_spv_source) / 4,
-                   NULL, 0, PIPE_SHADER_VERTEX, "main",
+                   NULL, 0, MESA_SHADER_VERTEX, "main",
                    &spirv_options, nir_options);
 
    assert(nir != NULL);