From 19eee14bedb3d41b8593cc220f0ad888e6d623ea Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Thu, 7 Aug 2025 14:19:14 -0400
Subject: [PATCH] meson,nvk: Require rustc-hash 2.0 or later

rustc-hash 1.1 does not have FxBuildHasher, and 1.2 has been yanked from
crates.io. I've verified that version 2.0 builds and seems to work, so
set the required version as 2.0.

Fixes: c1f979d84a78bfdd308f ("nak: Add a dependency on rustc-hash")
Reviewed-by: @LingMan
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36650>
(cherry picked from commit 9a579673dd14e32a7c4d514686ecdc01b4bb3b07)
---
 .pick_status.json                | 2 +-
 src/nouveau/compiler/meson.build | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4e4c99b5ca2..b7f324967d4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6064,7 +6064,7 @@
         "description": "meson,nvk: Require rustc-hash 2.0 or later",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c1f979d84a78bfdd308f107ae6ce3f779d9411bf",
         "notes": null
diff --git a/src/nouveau/compiler/meson.build b/src/nouveau/compiler/meson.build
index f5c882bb250..9d87a0d4aeb 100644
--- a/src/nouveau/compiler/meson.build
+++ b/src/nouveau/compiler/meson.build
@@ -8,6 +8,7 @@ dep_paste = dependency('paste',
 )
 
 dep_rustc_hash = dependency('rustc-hash',
+  version: '>= 2.0',
   fallback: ['rustc-hash', 'dep_rustc_hash'],
   required: true,
 )