diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2017-01-29 17:15:34 -0800 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-01-31 04:47:19 +0300 |
| commit | dbd4a35060b242839ba4d41e9bb743365faef8ce (patch) | |
| tree | cbfb93c045f05e57535a378aa11c1a073e791d29 /pkgs/development/compilers/glslang | |
| parent | 8d379ddfef1e7bcf123d8b0092f9924bf5232c07 (diff) | |
| download | nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.tar nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.tar.gz nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.tar.bz2 nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.tar.lz nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.tar.xz nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.tar.zst nixlib-dbd4a35060b242839ba4d41e9bb743365faef8ce.zip | |
vulkan-loader: 1.0.26.0 -> 1.0.39.1
Diffstat (limited to 'pkgs/development/compilers/glslang')
| -rw-r--r-- | pkgs/development/compilers/glslang/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/glslang/install-headers.patch | 25 |
2 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index cd03c246624e..d2384598456d 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2016-08-26"; + version = "2016-12-21"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `<vulkan-loader-repo>/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343"; - sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g"; + rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608"; + sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj"; }; patches = [ ./install-headers.patch ]; diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch index 9ad6f5e19068..75f271309780 100644 --- a/pkgs/development/compilers/glslang/install-headers.patch +++ b/pkgs/development/compilers/glslang/install-headers.patch @@ -1,21 +1,30 @@ diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 48a6c46..593d941 100755 +index c538e84..6ece1ab 100755 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt -@@ -42,3 +42,8 @@ endif(WIN32) +@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS) + endif(ENABLE_AMD_EXTENSIONS) + + if(ENABLE_NV_EXTENSIONS) +- set(HEADERS +- GLSL.ext.NV.h) ++ list(APPEND ++ HEADERS ++ GLSL.ext.NV.h) + endif(ENABLE_NV_EXTENSIONS) + + add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) +@@ -51,3 +52,5 @@ endif(WIN32) install(TARGETS SPIRV SPVRemapper ARCHIVE DESTINATION lib) + -+foreach(file ${HEADERS} ${SPVREMAP_HEADERS}) -+ get_filename_component(dir ${file} DIRECTORY) -+ install(FILES ${file} DESTINATION include/SPIRV/${dir}) -+endforeach() ++install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/) diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index ff91135..4318279 100644 +index 95d4bdd..e7fda90 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -90,3 +90,8 @@ endif(WIN32) +@@ -93,3 +93,8 @@ endif(WIN32) install(TARGETS glslang ARCHIVE DESTINATION lib) |