diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-08 11:32:55 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-08 11:33:08 +0200 |
| commit | fd77cd7a01f558ae47b446fc21e5666e5ded6814 (patch) | |
| tree | 1e44aa7c533520b8d8158d554a200e3fa088055d /pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | |
| parent | 46f29d4bd6305a9f7c743d3f9022a8d5f6d3cb12 (diff) | |
| parent | 97ad0928a5cb6512af4f92be062e9b31edc485d4 (diff) | |
| download | nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.gz nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.bz2 nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.lz nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.xz nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.zst nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.zip | |
Merge branch 'master' into staging-next
Indentation conflict in vulkan-related src fetches.
Diffstat (limited to 'pkgs/tools/graphics/vulkan-tools-lunarg/default.nix')
| -rw-r--r-- | pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 578089fb44b..0150f4e5c6f 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -27,14 +27,13 @@ stdenv.mkDerivation rec { # The version must match that in vulkan-headers version = "1.3.243.0"; - src = (assert version == vulkan-headers.version; - fetchFromGitHub { - owner = "LunarG"; - repo = "VulkanTools"; - rev = "sdk-${version}"; - hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4="; - fetchSubmodules = true; - }); + src = fetchFromGitHub { + owner = "LunarG"; + repo = "VulkanTools"; + rev = "sdk-${version}"; + hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4="; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake python3 jq which pkg-config ]; @@ -103,5 +102,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.expipiplus1 ]; + broken = (version != vulkan-headers.version); }; } |