diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vulkan-loader')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix | 16 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 067e47b3a2ff..d6af2ceabb28 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,15 +3,14 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.211.0"; + version = "1.3.249"; - src = (assert version == vulkan-headers.version; - fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Loader"; - rev = "sdk-${version}"; - sha256 = "sha256-NQu98wA7UK231rpoKDs1yQ6pEyB4wZg7MjFC3JwS2BY="; - }); + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Loader"; + rev = "v${version}"; + hash = "sha256-v4GEZEcQP3+oiT66sgysIZ2PdLSidyYjecb3TmcHG2Y="; + }; 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); }; } diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index b5c3bf4428ab..42295a67d466 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,10 +5,10 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ - + Name: @CMAKE_PROJECT_NAME@ Description: Vulkan Loader |