diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 4aa92921898..956b34fd93d 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { version = "3.104.0"; patches = [ - ./glsl-import.patch + (fetchpatch { + # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131 + url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch"; + sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc"; + }) ]; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/libplacebo/glsl-import.patch b/pkgs/development/libraries/libplacebo/glsl-import.patch deleted file mode 100644 index f2ef362c65b..00000000000 --- a/pkgs/development/libraries/libplacebo/glsl-import.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - #include --#include -+#include - - #include "glslang.h" -