nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 16:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #182585 from reckenrode/ncnn-update

Browse Source 
ncnn: 20220216 -> 20220721
This commit is contained in:
Mario Rodas 2022-07-23 10:47:39 -05:00 committed by GitHub
commit 4e9cc652be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/ncnn/default.nix
View File

@ -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 = [

13
pkgs/development/libraries/ncnn/gpu-include.patch
View File

@ -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"