From b5d19d8a9e62453390b2613de5eb9fee41d32b78 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 1 Jun 2023 09:34:48 -0600 Subject: [PATCH] obsidian: 1.3.4 -> 1.3.5 Changes: https://obsidian.md/changelog/2023-06-01-desktop-v1.3.5/ --- pkgs/applications/misc/obsidian/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 2ac7a692127e..e96255271dfd 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -4,7 +4,7 @@ , makeWrapper , electron , makeDesktopItem -, graphicsmagick +, imagemagick , writeScript , undmg , unzip @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.3.4"; + version = "1.3.5"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,12 +25,12 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-LP13smLy/cr0hiLl5cdRxTbDfRFojb+HJBx/MFeJ13Y=" else "sha256-8M9HU20IxTvPaa6x1X41Ldq2usK2TPU71VvprerivZg="; + sha256 = if stdenv.isDarwin then "sha256-bTIJwQqufzxq1/ZxR8rVYER82tl0pPMpKwDPr9Gz1Q4=" else "sha256-jhm6ziFaJnv4prPSfOnJ/EbIRTf9rnvzAJVxnVqmWE4="; }; icon = fetchurl { - url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; - sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; + url = "https://obsidian.md/images/obsidian-logo-gradient.svg"; + sha256 = "100j8fcrc5q8zv525siapminffri83s2khs2hw4kdxwrdjwh36qi"; }; desktopItem = makeDesktopItem { @@ -46,7 +46,7 @@ let linux = stdenv.mkDerivation { inherit pname version src desktopItem icon; meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; }; - nativeBuildInputs = [ makeWrapper graphicsmagick ]; + nativeBuildInputs = [ makeWrapper imagemagick ]; installPhase = '' runHook preInstall mkdir -p $out/bin @@ -59,7 +59,7 @@ let -t $out/share/applications/ for size in 16 24 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png done runHook postInstall '';