diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-09-17 22:19:40 -0700 |
|---|---|---|
| committer | Joe Hermaszewski <git@monoid.al> | 2016-10-12 13:19:34 +0100 |
| commit | e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a (patch) | |
| tree | 6afd3a699ba7629a4434430228bf9ce9bee3e476 /pkgs/development/libraries | |
| parent | b52e8809d68593f4dab7ea21f510d79d314b5d65 (diff) | |
| download | nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.tar nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.tar.gz nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.tar.bz2 nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.tar.lz nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.tar.xz nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.tar.zst nixlib-e0e27c83ab2c8082f1c5aed412ccfd6fccf8bb0a.zip | |
vulkan-loader: 1.0.21.0 -> 1.0.26.0
Also added asserts to ensure everything stays in sync.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 35d3e11a20ed..4dc59bddb6d8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,20 +3,29 @@ assert stdenv.system == "x86_64-linux"; -stdenv.mkDerivation rec { - name = "vulkan-loader-${version}"; - version = "1.0.21.0"; - +let + version = "1.0.26.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; - rev = "97e3b677d9681aa8d420c314edae96c4bf72246d"; - sha256 = "1y42rlffmr80rd4m0xfv2mfwd9qvd680i18vr0xs109narb6fm4f"; + rev = "sdk-${version}"; + sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58"; }; + getRev = name: builtins.substring 0 40 (builtins.readFile "${src}/${name}_revision"); +in + +assert getRev "spirv-tools" == spirv-tools.src.rev; +assert getRev "spirv-headers" == spirv-tools.headers.rev; +assert getRev "glslang" == glslang.src.rev; + +stdenv.mkDerivation rec { + name = "vulkan-loader-${version}"; + inherit version src; buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml glslang spirv-tools x11 libxcb wayland ]; + enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default |