pyrox.dev / nixpkgs
lol
fork atom

ncnn: 20220729 -> 20231027

Mario Rodas 00770519 9ec80ed6

+12 -11
unified split
+9 -9
pkgs/development/libraries/ncnn/cmakelists.patch
··· 2 index c453d23e..66b4aa24 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 - @@ -478,6 +478,8 @@ if(NCNN_VULKAN) 6 - 7 - find_package(Threads) 8 - 9 - + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") 10 - + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") 11 - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") 12 - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") 13 - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") 14 diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in 15 index b580fcee..be2becd0 100644 16 --- a/src/ncnn.pc.in
··· 2 index c453d23e..66b4aa24 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 + @@ -560,6 +560,8 @@ if(NCNN_VULKAN) 6 + message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") 7 + set(NCNN_SYSTEM_GLSLANG OFF) 8 + else() 9 + + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") 10 + + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") 11 + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") 12 + include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") 13 + if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") 14 diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in 15 index b580fcee..be2becd0 100644 16 --- a/src/ncnn.pc.in
+3 -2
pkgs/development/libraries/ncnn/default.nix
··· 11 12 stdenv.mkDerivation rec { 13 pname = "ncnn"; 14 - version = "20220729"; 15 16 src = fetchFromGitHub { 17 owner = "Tencent"; 18 repo = pname; 19 rev = version; 20 - sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; 21 }; 22 23 patches = [ ··· 45 homepage = "https://github.com/Tencent/ncnn"; 46 license = licenses.bsd3; 47 maintainers = with maintainers; [ tilcreator ]; 48 }; 49 }
··· 11 12 stdenv.mkDerivation rec { 13 pname = "ncnn"; 14 + version = "20231027"; 15 16 src = fetchFromGitHub { 17 owner = "Tencent"; 18 repo = pname; 19 rev = version; 20 + sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc="; 21 }; 22 23 patches = [ ··· 45 homepage = "https://github.com/Tencent/ncnn"; 46 license = licenses.bsd3; 47 maintainers = with maintainers; [ tilcreator ]; 48 + platforms = platforms.all; 49 }; 50 }