Merge pull request #182585 from reckenrode/ncnn-update

ncnn: 20220216 -> 20220721

pkgs/development/libraries/ncnn/default.nix

@@ -11,18 +11,17 @@
 
 stdenv.mkDerivation rec {
   pname = "ncnn";
-  version = "20220216";
+  version = "20220721";
 
   src = fetchFromGitHub {
     owner = "Tencent";
     repo = pname;
     rev = version;
-    sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew=";
+    sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8=";
   };
 
   patches = [
     ./cmakelists.patch
-    ./gpu-include.patch
   ];
 
   cmakeFlags = [

pkgs/development/libraries/ncnn/gpu-include.patch

@@ -1,13 +0,0 @@
-diff --git a/src/gpu.cpp b/src/gpu.cpp
-index 51cd7f95..bf7ed828 100644
---- a/src/gpu.cpp
-+++ b/src/gpu.cpp
-@@ -21,7 +21,7 @@
- #include <vulkan/vulkan.h>
- 
- #include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include "glslang/Public/ShaderLang.h"
- 
- #include "command.h"
- #include "layer.h"