Unverified Commit 1426bb14 authored by TomaSajt's avatar TomaSajt
Browse files

gale: fix build by patching tauri version to match

parent eb493e4e

pkgs/by-name/ga/gale/fix-frontend-backend-tauri-version-mismatch.patch

0 → 100644
+88 −0
Original line number Diff line number Diff line 
diff --git a/package.json b/package.json

index baa5356..d2c5dcf 100644

--- a/package.json

+++ b/package.json

@@ -32,7 +32,7 @@

 	},

 	"type": "module",

 	"dependencies": {

-		"@tauri-apps/api": "^2.6.0",

+		"@tauri-apps/api": "2.7.0",

 		"@tauri-apps/plugin-clipboard-manager": "^2.3.0",

 		"@tauri-apps/plugin-deep-link": "^2.4.0",

 		"@tauri-apps/plugin-dialog": "^2.3.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

index 562bafc..50dac76 100644

--- a/pnpm-lock.yaml

+++ b/pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:

   .:

     dependencies:

       '@tauri-apps/api':

-        specifier: ^2.6.0

-        version: 2.6.0

+        specifier: 2.7.0

+        version: 2.7.0

       '@tauri-apps/plugin-clipboard-manager':

         specifier: ^2.3.0

         version: 2.3.0

@@ -517,8 +517,8 @@ packages:

     peerDependencies:

       vite: ^5.2.0 || ^6 || ^7

 

-  '@tauri-apps/api@2.6.0':

-    resolution: {integrity: sha512-hRNcdercfgpzgFrMXWwNDBN0B7vNzOzRepy6ZAmhxi5mDLVPNrTpo9MGg2tN/F7JRugj4d2aF7E1rtPXAHaetg==}

+  '@tauri-apps/api@2.7.0':

+    resolution: {integrity: sha512-v7fVE8jqBl8xJFOcBafDzXFc8FnicoH3j8o8DNNs0tHuEBmXUDqrCOAzMRX0UkfpwqZLqvrvK0GNQ45DfnoVDg==}

 

   '@tauri-apps/plugin-clipboard-manager@2.3.0':

     resolution: {integrity: sha512-81NOBA2P+OTY8RLkBwyl9ZR/0CeggLub4F6zxcxUIfFOAqtky7J61+K/MkH2SC1FMxNBxrX0swDuKvkjkHadlA==}

@@ -1548,39 +1548,39 @@ snapshots:

       tailwindcss: 4.1.11

       vite: 5.4.19(lightningcss@1.30.1)

 

-  '@tauri-apps/api@2.6.0': {}

+  '@tauri-apps/api@2.7.0': {}

 

   '@tauri-apps/plugin-clipboard-manager@2.3.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-deep-link@2.4.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-dialog@2.3.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-http@2.5.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-os@2.3.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-process@2.3.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-shell@2.3.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@tauri-apps/plugin-updater@2.9.0':

     dependencies:

-      '@tauri-apps/api': 2.6.0

+      '@tauri-apps/api': 2.7.0

 

   '@types/cookie@0.6.0': {}

pkgs/by-name/ga/gale/package.nix

+12 −5
Original line number Diff line number Diff line
@@ -29,16 +29,23 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    hash = "sha256-SnPYuMYdoY69CWMztuDxw0ohRDU2uECNhBs46hLg+eA=";

  };



  postPatch = ''

    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json

  '';

  patches = [ ./fix-frontend-backend-tauri-version-mismatch.patch ];



  pnpmDeps = pnpm_10.fetchDeps {

    inherit (finalAttrs) pname version src;

    inherit (finalAttrs)

      pname

      version

      src

      patches

      ;

    fetcherVersion = 1;

    hash = "sha256-DYhPe59qfsSjyMIN31RL0mrHfmE6/I1SF+XutettkO8=";

    hash = "sha256-ILhAhpY9a50a0KKWs5Y+G3jDyWuySHw8QcOJlYePzmc=";

  };



  postPatch = ''

    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json

  '';



  cargoRoot = "src-tauri";

  buildAndTestSubdir = finalAttrs.cargoRoot;