diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-01-09 20:12:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 20:12:46 +0100 |
| commit | ef125069f4ca33d78f02c11c0450a1bd09f8c44b (patch) | |
| tree | dbb9345345de092d967abf6f39af6bf108741532 /pkgs | |
| parent | dca46f6bd92485693ad3f7d18b3235d7d6794489 (diff) | |
| parent | 95b754cf422867d8ad6623e841ff47950e89781d (diff) | |
Merge pull request #108730 from baloo/baloo/libplacebo/path-upsteam-patch
libplacebo: use upstreamed patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libplacebo/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libplacebo/glsl-import.patch | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 4aa92921898dc..956b34fd93dd7 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 f2ef362c65b14..0000000000000 --- 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" - |