diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
commit | 34b58aaefccdb5c64b912903973ba729bae58be3 (patch) | |
tree | e18a96bc0f066422356a8da655453403baa97e64 /nixpkgs/pkgs/development/libraries/ncnn | |
parent | 7be318098d7fe87d896e8787bfadc0345149cb59 (diff) | |
parent | 3fb937a1e9f4157f57011965b99fcb7f4139d9ad (diff) | |
download | nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.gz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.bz2 nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.lz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.xz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.zst nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ncnn')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch | 18 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ncnn/default.nix | 5 |
2 files changed, 12 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch b/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch index 30f39a7a3f50..bdb3063acec4 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch +++ b/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch @@ -2,15 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c453d23e..66b4aa24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -478,6 +478,8 @@ if(NCNN_VULKAN) - - find_package(Threads) - -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") +@@ -560,6 +560,8 @@ if(NCNN_VULKAN) + message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") + set(NCNN_SYSTEM_GLSLANG OFF) + else() ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") + if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in index b580fcee..be2becd0 100644 --- a/src/ncnn.pc.in diff --git a/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/nixpkgs/pkgs/development/libraries/ncnn/default.nix index 0b07fab8668c..69967eae160d 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220729"; + version = "20231027"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; + sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc="; }; patches = [ @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tencent/ncnn"; license = licenses.bsd3; maintainers = with maintainers; [ tilcreator ]; + platforms = platforms.all; }; } |