diff --git a/pkgs/by-name/ma/mangayomi/gitHashes.json b/pkgs/by-name/ma/mangayomi/gitHashes.json index c5c136bc8723..3b9796b59fc0 100644 --- a/pkgs/by-name/ma/mangayomi/gitHashes.json +++ b/pkgs/by-name/ma/mangayomi/gitHashes.json @@ -1,6 +1,7 @@ { "desktop_webview_window": "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA=", "epubx": "sha256-Rf9zaabPvP7D4NgyJ+LpSB8zHjBvhq2wE0p9Sy7uOXM=", + "flutter_discord_rpc_fork": "sha256-JXeYicEiEIFCDIgHNa3zqrwsy05qBeFvdihghi/3tRs=", "flutter_qjs": "sha256-uF3+lQyc6oXWjg9xm8PVXRNZ3AXrw7+FH/lPIQPzaJY=", "flutter_web_auth_2": "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=", "media_kit_video": "sha256-t8lqS44lylLhMyvlY5G1k7EXfpDq8WshBVg8D/z0Hbc=", diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index c562439b2399..b093d409157c 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -13,13 +13,13 @@ let pname = "mangayomi"; - version = "0.6.3"; + version = "0.6.35"; src = fetchFromGitHub { owner = "kodjodevf"; repo = "mangayomi"; tag = "v${version}"; - hash = "sha256-nlA5DLYSj9VVpDo7o5Umccoz8RAF+ac3LWV7108t2Ds="; + hash = "sha256-XSXFo0+rLTUJ0p3F5+CvKD85OmrShb2xrpQK0F6fo2U="; }; metaCommon = { @@ -51,7 +51,7 @@ flutter332.buildFlutterApplication { customSourceBuilders = { rust_lib_mangayomi = { version, src, ... }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "rust_lib_mangayomi"; inherit version src; inherit (src) passthru; @@ -68,6 +68,45 @@ flutter332.buildFlutterApplication { cp ${fakeCargokitCmake} rust_builder/cargokit/cmake/cargokit.cmake ''; + installPhase = '' + runHook preInstall + + cp -r . "$out" + + runHook postInstall + ''; + }; + flutter_discord_rpc_fork = + { version, src, ... }: + let + flutter_discord_rpc_fork-rs = rustPlatform.buildRustPackage { + pname = "flutter_discord_rpc_fork-rs"; + inherit version src; + + buildAndTestSubdir = "rust"; + + cargoHash = "sha256-vYVg5ZALQDrolDtbbXm/epE5MmSKpRJbSU15VDiKh4U="; + + passthru.libraryPath = "lib/libflutter_discord_rpc_fork.so"; + }; + in + stdenv.mkDerivation { + pname = "flutter_discord_rpc_fork"; + inherit version src; + inherit (src) passthru; + + postPatch = + let + fakeCargokitCmake = writeText "FakeCargokit.cmake" '' + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + set("''${target}_cargokit_lib" ${flutter_discord_rpc_fork-rs}/${flutter_discord_rpc_fork-rs.passthru.libraryPath} PARENT_SCOPE) + endfunction() + ''; + in + '' + cp ${fakeCargokitCmake} cargokit/cmake/cargokit.cmake + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json index 60e325e5018b..bcb22ae5de16 100644 --- a/pkgs/by-name/ma/mangayomi/pubspec.lock.json +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -440,11 +440,11 @@ "dependency": "direct main", "description": { "name": "d4rt", - "sha256": "40ecf0b73603a8268050e890eb4d037b5bdf4184f439cc18d593e83b100a19e7", + "sha256": "4220081caf1cea231e127a8fd2801b4b55464a51f840b56bb079ce2b3792e9e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.9" + "version": "0.1.1" }, "dart_style": { "dependency": "transitive", @@ -684,6 +684,17 @@ "source": "hosted", "version": "3.4.1" }, + "flutter_discord_rpc_fork": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "main", + "resolved-ref": "67e99dd4547bdba15a49d53ab61f50397b194804", + "url": "https://github.com/Schnitzel5/flutter-discord-rpc.git" + }, + "source": "git", + "version": "1.0.4" + }, "flutter_inappwebview": { "dependency": "direct main", "description": {