colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obsidian: Fix meta

Browse Source 
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.
This commit is contained in:
Lars Jellema 2022-04-02 13:52:34 +02:00 committed by Alyssa Ross
parent fe871db088
commit 97836a1130
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/misc/obsidian/default.nix
View File

@ -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 = ''