wgpu-utils: 0.16.1 -> 22.1.0, move to pkgs/by-name

Changelog: https://github.com/gfx-rs/wgpu/releases/tag/v22.0.0

pkgs/by-name/wg/wgpu-utils/package.nix

@@ -1,30 +1,55 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, vulkan-loader, QuartzCore }:
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  cmake,
+  makeWrapper,
+  vulkan-loader,
+  freetype,
+  fontconfig,
+  darwin,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "wgpu-utils";
-  version = "0.16.1";
+  version = "22.1.0";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu";
     rev = "v${version}";
-    hash = "sha256-tGjjjQDcN9zkxQSOrW/D1Pu6cycTKo/lh71mTEpZQIE=";
+    hash = "sha256-Gtq0xYZoWNwW+BKVLqVVKGqc+4HjaD7NN1hlzyFP5g0=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "d3d12-0.6.0" = "sha256-xCazXUriIQWMVa3DOI1aySBATmYwyDqsVYULRV2l/44=";
-      "naga-0.12.0" = "sha256-EZ8ZKixOFPT9ZTKIC/UGh2B3F09ENbCTUi+ASamJzMM=";
+      "noise-0.8.2" = "sha256-7GvShJeSNfwMCBIfqLghXgKQv7EDMqVchJw0uxPhNr4=";
+      "rspirv-0.11.0+sdk-1.2.198" = "sha256-AcJqkcXBr/+SHdUDXd63sQ0h5eosMqRhV4aUREJH8Bw=";
     };
   };
 
   nativeBuildInputs = [
     pkg-config
+    cmake
     makeWrapper
   ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin QuartzCore;
+  buildInputs =
+    [
+      freetype
+      fontconfig
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        CoreServices
+        QuartzCore
+        AppKit
+      ]
+    );
 
   # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan).
   doCheck = false;
@@ -37,7 +62,10 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Safe and portable GPU abstraction in Rust, implementing WebGPU API";
     homepage = "https://wgpu.rs/";
-    license = with licenses; [ asl20 /* or */ mit ];
+    license = with licenses; [
+      asl20 # or
+      mit
+    ];
     maintainers = with maintainers; [ erictapen ];
     mainProgram = "wgpu-info";
   };

pkgs/top-level/all-packages.nix

@@ -13804,10 +13804,6 @@ with pkgs;
 
   wget2 = callPackage ../tools/networking/wget2 { };
 
-  wgpu-utils = callPackage ../tools/graphics/wgpu-utils {
-    inherit (darwin.apple_sdk.frameworks) QuartzCore;
-  };
-
   wg-bond = callPackage ../applications/networking/wg-bond { };
 
   wgcf = callPackage ../applications/networking/wgcf { };