commit 3aedf37e03aa3ef27a6f27c62395e860c138eda2 · pyrox.dev/nixpkgs

+32 -24

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

···

       69
       69
        
         useFetchCargoVendor = true;

     

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

     

       71
       71
        
         buildAndTestSubdir = cargoRoot;

     

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

     

       72
       72
       +
         cargoPatches = [

     

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

     

       74
       74
       +
           ./remove-code-signing-darwin.patch

     

       75
       75
       +
         ];

     

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

     

       74
       77
        
       

     

       75
       75
       -
         nativeBuildInputs = [

     

       76
       76
       -
           proper-cargo-tauri.hook

     

       78
       78
       +
         nativeBuildInputs =

     

       79
       79
       +
           [

     

       80
       80
       +
             proper-cargo-tauri.hook

     

       77
       81
        
       

     

       78
       78
       -
           # Setup pnpm

     

       79
       79
       -
           nodejs

     

       80
       80
       -
           pnpm_9.configHook

     

       82
       82
       +
             # Setup pnpm

     

       83
       83
       +
             nodejs

     

       84
       84
       +
             pnpm_9.configHook

     

       81
       85
        
       

     

       82
       82
       -
           # Make sure we can find our libraries

     

       83
       83
       -
           perl

     

       84
       84
       -
           pkg-config

     

       85
       85
       -
           protobuf

     

       86
       86
       -
           wrapGAppsHook4

     

       87
       87
       -
         ];

     

       86
       86
       +
             # Make sure we can find our libraries

     

       87
       87
       +
             perl

     

       88
       88
       +
             pkg-config

     

       89
       89
       +
             protobuf

     

       90
       90
       +
           ]

     

       91
       91
       +
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       92
       92
       +
             wrapGAppsHook4

     

       93
       93
       +
           ];

     

       88
       94
        
       

     

       89
       95
        
         buildInputs =

     

       90
       96
        
           [ openssl ]

     

       91
       91
       -
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       92
       92
       -
             glib-networking

     

       93
       93
       -
             libayatana-appindicator

     

       94
       94
       -
           ]

     

       95
       95
       -
           ++ lib.optionals (app-type == "main") [

     

       96
       96
       -
             webkitgtk_4_1

     

       97
       97
       -
             libsoup_3

     

       98
       98
       -
           ]

     

       99
       99
       -
           ++ lib.optionals (app-type == "legacy") [

     

       100
       100
       -
             webkitgtk_4_0

     

       101
       101
       -
             libsoup_2_4

     

       102
       102
       -
           ];

     

       97
       97
       +
           ++ lib.optionals stdenv.hostPlatform.isLinux (

     

       98
       98
       +
             [

     

       99
       99
       +
               glib-networking

     

       100
       100
       +
               libayatana-appindicator

     

       101
       101
       +
             ]

     

       102
       102
       +
             ++ lib.optionals (app-type == "main") [

     

       103
       103
       +
               webkitgtk_4_1

     

       104
       104
       +
               libsoup_3

     

       105
       105
       +
             ]

     

       106
       106
       +
             ++ lib.optionals (app-type == "legacy") [

     

       107
       107
       +
               webkitgtk_4_0

     

       108
       108
       +
               libsoup_2_4

     

       109
       109
       +
             ]

     

       110
       110
       +
           );

     

       103
       111
        
       

     

       104
       112
        
         passthru =

     

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

+12

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

···

       1
       1
       +
       diff --git a/app/main/src-tauri/tauri.conf.json b/app/main/src-tauri/tauri.conf.json

     

       2
       2
       +
       index 1114b19..c4cc8f4 100644

     

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

     

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

     

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

     

       6
       6
       +
            "macOS": {

     

       7
       7
       +
              "frameworks": [],

     

       8
       8
       +
              "exceptionDomain": "",

     

       9
       9
       +
       -      "signingIdentity": "-",

     

       10
       10
       +
              "providerShortName": null,

     

       11
       11
       +
              "entitlements": null

     

       12
       12
       +
            },