BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #108727 from baloo/baloo/libplacebo/glsl-import

Browse source 
libplacebo: fixup glslang headers path

The build broke after the latest glslang update:
31bd59648f.
This commit is contained in:
Michael Weiss 2021-01-07 23:32:26 +01:00 committed by GitHub
commit e597a82ae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libplacebo/default.nix
View file

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
pname = "libplacebo";
version = "2.72.2";
patches = [
./glsl-import.patch
];
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";

13
pkgs/development/libraries/libplacebo/glsl-import.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/glsl/glslang.cc b/src/glsl/glslang.cc
index f701acc..c64cbf5 100644
--- a/src/glsl/glslang.cc
+++ b/src/glsl/glslang.cc
@@ -26,7 +26,7 @@ extern "C" {
#include <glslang/Include/ResourceLimits.h>
#include <glslang/Public/ShaderLang.h>
-#include <SPIRV/GlslangToSpv.h>
+#include <glslang/SPIRV/GlslangToSpv.h>
#include "glslang.h"