diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2022-07-23 10:27:48 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2022-07-23 10:33:51 -0400 |
| commit | 8c21ef98fba4b2560a663345cac6782447a36575 (patch) | |
| tree | fdd1306f0196bf8e76d8b763844cec9ab7d3d55d /pkgs/development/libraries/ncnn | |
| parent | 9bde9353e94dc0acdc1e4678333f423502cca4a3 (diff) | |
ncnn: 20220216 -> 20220721
Diffstat (limited to 'pkgs/development/libraries/ncnn')
| -rw-r--r-- | pkgs/development/libraries/ncnn/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/ncnn/gpu-include.patch | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index 8c0f213b82980..bf4b74c036491 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/ncnn/gpu-include.patch b/pkgs/development/libraries/ncnn/gpu-include.patch deleted file mode 100644 index 8f751c7699470..0000000000000 --- a/pkgs/development/libraries/ncnn/gpu-include.patch +++ /dev/null @@ -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" |