Unverified Commit 5599f0b1 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

rquickshare: fix darwin build (#407529)

parents d0658f2a bedc1f26

doc/hooks/tauri.section.md

+15 −12
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    hash = "...";

  };



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      # Pull in our main hook

      cargo-tauri.hook
@@ -45,6 +46,8 @@ rustPlatform.buildRustPackage (finalAttrs: { 


      # Make sure we can find our libraries

      pkg-config

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      wrapGAppsHook4

    ];

pkgs/by-name/rq/rquickshare/package.nix

+32 −24
Original line number Diff line number Diff line
@@ -69,10 +69,14 @@ rustPlatform.buildRustPackage rec { 
  useFetchCargoVendor = true;

  cargoRoot = "app/${app-type}/src-tauri";

  buildAndTestSubdir = cargoRoot;

  cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ];

  cargoPatches = [

    ./remove-duplicate-versions-of-sys-metrics.patch

    ./remove-code-signing-darwin.patch

  ];

  cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w=";



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      proper-cargo-tauri.hook



      # Setup pnpm
@@ -83,12 +87,15 @@ rustPlatform.buildRustPackage rec { 
      perl

      pkg-config

      protobuf

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      wrapGAppsHook4

    ];



  buildInputs =

    [ openssl ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

    ++ lib.optionals stdenv.hostPlatform.isLinux (

      [

        glib-networking

        libayatana-appindicator

      ]
@@ -99,7 +106,8 @@ rustPlatform.buildRustPackage rec { 
      ++ lib.optionals (app-type == "legacy") [

        webkitgtk_4_0

        libsoup_2_4

    ];

      ]

    );



  passthru =

    # Don't set an update script for the legacy version

pkgs/by-name/rq/rquickshare/remove-code-signing-darwin.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff --git a/app/main/src-tauri/tauri.conf.json b/app/main/src-tauri/tauri.conf.json

index 1114b19..c4cc8f4 100644

--- a/app/main/src-tauri/tauri.conf.json

+++ b/app/main/src-tauri/tauri.conf.json

@@ -23,7 +23,6 @@

     "macOS": {

       "frameworks": [],

       "exceptionDomain": "",

-      "signingIdentity": "-",

       "providerShortName": null,

       "entitlements": null

     },