surrealist: use simplify overriding logic for cargo-tauri_2.hook

NixOS · Oct 29, 2024 · 68c2cc8 · 68c2cc8
1 parent 0cb6dd8
commit 68c2cc8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -48,21 +48,6 @@ let
         ]
       );
 
-    meta = {
-      description = "Build smaller, faster, and more secure desktop applications with a web frontend";
-      homepage = "https://tauri.app/";
-      changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-v${version}";
-      license = with lib.licenses; [
-        asl20 # or
-        mit
-      ];
-      maintainers = with lib.maintainers; [
-        dit7ya
-        getchoo
-        happysalada
-      ];
-      mainProgram = "cargo-tauri";
-    };
   };
 in
 
@@ -77,5 +62,21 @@ cargo-tauri.overrideAttrs (
         setupHooks = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; };
       };
     };
+
+    meta = {
+      description = "Build smaller, faster, and more secure desktop applications with a web frontend";
+      homepage = "https://tauri.app/";
+      changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-v${finalAttrs.version}";
+      license = with lib.licenses; [
+        asl20 # or
+        mit
+      ];
+      maintainers = with lib.maintainers; [
+        dit7ya
+        getchoo
+        happysalada
+      ];
+      mainProgram = "cargo-tauri";
+    };
   }
 )
diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cargo
-    (cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })
+    cargo-tauri_2.hook
     gobject-introspection
     makeBinaryWrapper
     nodejs