From 97836a11309a2a1d590a179dd85aa86a3bce19d9 Mon Sep 17 00:00:00 2001
From: Lars Jellema <lars.jellema@gmail.com>
Date: Sat, 2 Apr 2022 13:52:34 +0200
Subject: [PATCH] obsidian: Fix meta

1. Common meta was accidentally not passed to mkDerivation.
2. Add aarch64-linux to meta.platforms. I've tested it on asahi nixos
   and it seems to run fine.
3. Move some stuff around to avoid recursive attribute sets to avoid
   infinite recursion when updating meta.
---
 pkgs/applications/misc/obsidian/default.nix | 40 ++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index ce95cf8f306e..d34770051d0b 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -13,6 +13,7 @@ let
   inherit (stdenv.hostPlatform) system;
   pname = "obsidian";
   version = "0.14.2";
+  appname = "Obsidian";
   meta = with lib; {
     description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
     homepage = "https://obsidian.md";
@@ -27,24 +28,24 @@ let
     sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
   };
 
-  linux = stdenv.mkDerivation rec {
-    icon = fetchurl {
-      url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
-      sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
-    };
+  icon = fetchurl {
+    url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
+    sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
+  };
 
-    desktopItem = makeDesktopItem {
-      name = "obsidian";
-      desktopName = "Obsidian";
-      comment = "Knowledge base";
-      icon = "obsidian";
-      exec = "obsidian %u";
-      categories = [ "Office" ];
-      mimeTypes = [ "x-scheme-handler/obsidian" ];
-    };
+  desktopItem = makeDesktopItem {
+    name = "obsidian";
+    desktopName = "Obsidian";
+    comment = "Knowledge base";
+    icon = "obsidian";
+    exec = "obsidian %u";
+    categories = [ "Office" ];
+    mimeTypes = [ "x-scheme-handler/obsidian" ];
+  };
 
-    inherit pname version src;
-    meta.platforms = [ "x86_64-linux" ];
+  linux = stdenv.mkDerivation {
+    inherit pname version src desktopItem icon;
+    meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; };
     nativeBuildInputs = [ makeWrapper graphicsmagick ];
     installPhase = ''
       runHook preInstall
@@ -71,10 +72,9 @@ let
     '';
   };
 
-  darwin = stdenv.mkDerivation rec {
-    appname = "Obsidian";
-    inherit pname version src;
-    meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ];
+  darwin = stdenv.mkDerivation {
+    inherit pname version src appname;
+    meta = meta // { platforms = [ "x86_64-darwin" "aarch64-darwin" ]; };
     sourceRoot = "${appname}.app";
     nativeBuildInputs = [ makeWrapper undmg unzip ];
     installPhase = ''