From 1901448c92ecede7f809c287fe74fa7acf9a1487 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 15:01:12 +0800
Subject: [PATCH] ncnn: 20241226 -> 20250503

Diff: https://github.com/Tencent/ncnn/compare/20241226...20250503
---
 pkgs/by-name/nc/ncnn/cmakelists.patch |  8 ++++----
 pkgs/by-name/nc/ncnn/package.nix      | 25 ++++++++++++-------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/nc/ncnn/cmakelists.patch b/pkgs/by-name/nc/ncnn/cmakelists.patch
index a43d7b0c4b72..54f4270fc9ef 100644
--- a/pkgs/by-name/nc/ncnn/cmakelists.patch
+++ b/pkgs/by-name/nc/ncnn/cmakelists.patch
@@ -2,17 +2,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 785e2cd..459024d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -589,7 +589,8 @@ endif()
- if(NCNN_VULKAN)
-     if(NCNN_SYSTEM_GLSLANG)
+@@ -762,7 +762,8 @@
          find_package(Threads)
+         find_package(SPIRV-Tools QUIET)
+         find_package(SPIRV-Tools-opt QUIET)
 -        find_package(glslang QUIET)
 +        find_package(SPIRV-Tools-opt REQUIRED)
 +        find_package(glslang REQUIRED)
          if(glslang_FOUND)
              add_library(glslang ALIAS glslang::glslang)
              add_library(SPIRV ALIAS glslang::SPIRV)
-@@ -601,7 +602,6 @@ if(NCNN_VULKAN)
+@@ -774,7 +775,6 @@
                  set(NCNN_SYSTEM_GLSLANG OFF)
              else()
                  include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
diff --git a/pkgs/by-name/nc/ncnn/package.nix b/pkgs/by-name/nc/ncnn/package.nix
index 64fdee7449a9..a4e8b4649d2f 100644
--- a/pkgs/by-name/nc/ncnn/package.nix
+++ b/pkgs/by-name/nc/ncnn/package.nix
@@ -10,20 +10,18 @@
   protobuf,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ncnn";
-  version = "20241226";
+  version = "20250503";
 
   src = fetchFromGitHub {
     owner = "Tencent";
     repo = "ncnn";
-    rev = version;
-    hash = "sha256-XmIuXR/uxJbXaB0G+tS9I47Pke20qj8jI1vqnDDgrpE=";
+    tag = finalAttrs.version;
+    hash = "sha256-7wktoeei16QaPdcxVVS25sZYPhTQMEq9PjaHBwm5Eas=";
   };
 
-  patches = [
-    ./cmakelists.patch
-  ];
+  patches = [ ./cmakelists.patch ];
 
   cmakeFlags =
     [
@@ -40,6 +38,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ];
 
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     vulkan-headers
     vulkan-loader
@@ -48,11 +47,11 @@ stdenv.mkDerivation rec {
     protobuf
   ];
 
-  meta = with lib; {
-    description = "ncnn is a high-performance neural network inference framework optimized for the mobile platform";
+  meta = {
+    description = "Neural network inference framework";
     homepage = "https://github.com/Tencent/ncnn";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ tilcreator ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ tilcreator ];
+    platforms = lib.platforms.all;
   };
-}
+})