From 95b754cf422867d8ad6623e841ff47950e89781d Mon Sep 17 00:00:00 2001
From: Arthur Gautier <baloo@superbaloo.net>
Date: Thu, 7 Jan 2021 23:17:47 +0000
Subject: [PATCH] libplacebo: use upstreamed patch

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
---
 pkgs/development/libraries/libplacebo/default.nix   |  6 +++++-
 .../libraries/libplacebo/glsl-import.patch          | 13 -------------
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/libplacebo/glsl-import.patch

diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
index 7d120f604d8..86f84822c4a 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
   version = "2.72.2";
 
   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 <glslang/Include/ResourceLimits.h>
- #include <glslang/Public/ShaderLang.h>
--#include <SPIRV/GlslangToSpv.h>
-+#include <glslang/SPIRV/GlslangToSpv.h>
- 
- #include "glslang.h"
-