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/development/libraries/vulkan-loader/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/development/libraries/vulkan-loader/default.nix')
-rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 71d63db00f9..7cad0a38779 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -5,13 +5,12 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; version = "1.3.243.0"; - src = (assert version == vulkan-headers.version; - fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Loader"; - rev = "sdk-${version}"; - hash = "sha256-DqgIg0jZxzhoyYrATDQMoNN/Pav9deKdltB7L0XDqPE="; - }); + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Loader"; + rev = "sdk-${version}"; + hash = "sha256-DqgIg0jZxzhoyYrATDQMoNN/Pav9deKdltB7L0XDqPE="; + }; patches = [ ./fix-pkgconfig.patch ]; @@ -41,5 +40,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; + broken = (version != vulkan-headers.version); }; } |