dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #315110 from Cryolitia/maa

Browse Source 
maa-assistant-arknights: 5.2.3 -> 5.3.1
This commit is contained in:
Nick Cao 2024-05-28 13:55:44 -04:00 committed by GitHub
commit b42bfe30e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix
View File

@ -23,11 +23,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
version = "0-unstable-2023-10-09";
src = fetchFromGitHub {
owner = "Cryolitia";
owner = "MaaAssistantArknights";
repo = "FastDeploy";
# follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4
rev = "2e68908141f6950bc5d22ba84f514e893cc238ea";
hash = "sha256-BWO4lKZhwNG6mbkC70hPgMNjabTnEV5XMo0bLV/gvQs=";
# follows but not fully follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4
rev = "0db6000aaac250824266ac37451f43ce272d80a3";
hash = "sha256-5TItnPDc5WShpZAgBYeqgI9KKkk3qw/M8HPMlq/H4BM=";
};
outputs = [ "out" "cmake" ];

21
pkgs/by-name/ma/maa-assistant-arknights/package.nix
View File

@ -29,27 +29,6 @@ stdenv.mkDerivation (finalAttr: {
hash = if isBeta then sources.beta.hash else sources.stable.hash;
};
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=maa-assistant-arknights
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'RUNTIME DESTINATION .' ' ' \
--replace-fail 'LIBRARY DESTINATION .' ' ' \
--replace-fail 'PUBLIC_HEADER DESTINATION .' ' '
substituteInPlace CMakeLists.txt \
--replace-fail 'find_package(asio ' '# find_package(asio ' \
--replace-fail 'asio::asio' ' '
shopt -s globstar nullglob
substituteInPlace src/MaaCore/**/{*.h,*.cpp,*.hpp,*.cc} \
--replace 'onnxruntime/core/session/' ""
substituteInPlace CMakeLists.txt \
--replace-fail 'ONNXRuntime' 'onnxruntime'
cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
'';
nativeBuildInputs = [
asio
cmake

8
pkgs/by-name/ma/maa-assistant-arknights/pin.json
View File

@ -1,10 +1,10 @@
{
"stable": {
"version": "5.2.3",
"hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o="
"version": "5.3.1",
"hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="
},
"beta": {
"version": "5.2.3",
"hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o="
"version": "5.3.1",
"hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="
}
}