From 2e3b19b81d46ae9748d9d936c252e6e88c3157fb Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 4 Oct 2021 20:22:09 +0200 Subject: [PATCH] wgpu: rename to wgpu-utils, use upstream tag --- pkgs/tools/graphics/{wgpu => wgpu-utils}/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/tools/graphics/{wgpu => wgpu-utils}/default.nix (77%) diff --git a/pkgs/tools/graphics/wgpu/default.nix b/pkgs/tools/graphics/wgpu-utils/default.nix similarity index 77% rename from pkgs/tools/graphics/wgpu/default.nix rename to pkgs/tools/graphics/wgpu-utils/default.nix index 31933000bf96..737f7132212c 100644 --- a/pkgs/tools/graphics/wgpu/default.nix +++ b/pkgs/tools/graphics/wgpu-utils/default.nix @@ -1,17 +1,17 @@ { lib, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, vulkan-loader }: rustPlatform.buildRustPackage rec { - pname = "wgpu"; + pname = "wgpu-utils"; version = "0.10.0"; src = fetchFromGitHub { owner = "gfx-rs"; - repo = pname; - rev = "9da5c1d3a026c275feb57606b8c8d61f82b43386"; - sha256 = "sha256-DcIMP06tlMxI16jqpKqei32FY8h7z41Nvygap2MQC8A="; + repo = "wgpu"; + rev = "utils-${version}"; + sha256 = "sha256-bOUcLtT5iPZuUgor2d/pJQ4Y+I1LMzREgj1cwLAvd+s="; }; - cargoSha256 = "sha256-3gtIx337IP5t4nYGysOaU7SZRJrvVjYXN7mAqGbVlo8="; + cargoSha256 = "sha256-SSEG8JApQrgP7RWlXqb+xuy482oQZ5frE2IaVMruuG0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8255d86d4b63..c4f3a7f06e82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10500,7 +10500,7 @@ with pkgs; }); }; - wgpu = callPackage ../tools/graphics/wgpu { }; + wgpu-utils = callPackage ../tools/graphics/wgpu-utils { }; wg-bond = callPackage ../applications/networking/wg-bond { };