From fa813bf120b659ea8b392f918c27606496c60ec7 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:28:46 -0700 Subject: [PATCH] starc: refactor --- pkgs/by-name/st/starc/package.nix | 43 +++++++++++-------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/st/starc/package.nix b/pkgs/by-name/st/starc/package.nix index e9401e32e89d..0c1cb0e656b1 100644 --- a/pkgs/by-name/st/starc/package.nix +++ b/pkgs/by-name/st/starc/package.nix @@ -1,47 +1,34 @@ { - stdenvNoCC, lib, fetchurl, appimageTools, makeWrapper, }: - -stdenvNoCC.mkDerivation (finalAttrs: { +let pname = "starc"; version = "0.7.7"; - src = fetchurl { - url = "https://github.com/story-apps/starc/releases/download/v${finalAttrs.version}/starc-setup.AppImage"; + url = "https://github.com/story-apps/starc/releases/download/v${version}/starc-setup.AppImage"; hash = "sha256-jjas5vx+emdc4OUjXFAGYkKrR6cgb9BlabVv17KAaIQ="; }; - dontUnpack = true; - + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; nativeBuildInputs = [ makeWrapper ]; - - installPhase = - let - appimageContents = appimageTools.extract { inherit (finalAttrs) pname version src; }; - starc-unwrapped = appimageTools.wrapType2 { inherit (finalAttrs) pname version src; }; - in - '' - runHook preInstall - - # Fixup desktop item icons - install -D ${appimageContents}/starc.desktop -t $out/share/applications/ - - substituteInPlace $out/share/applications/starc.desktop \ + extraInstallCommands = '' + # Fixup desktop item icons + install -D ${appimageContents}/starc.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/starc.desktop \ --replace-fail "Icon=starc" "${'' Icon=dev.storyapps.starc StartupWMClass=Story Architect''}" + cp -r ${appimageContents}/share/* $out/share/ - cp -r ${appimageContents}/share/* $out/share/ - - makeWrapper ${starc-unwrapped}/bin/starc $out/bin/starc \ - --unset QT_PLUGIN_PATH - - runHook postInstall - ''; + wrapProgram $out/bin/starc \ + --unset QT_PLUGIN_PATH + ''; meta = { description = "Intuitive screenwriting app that streamlines the writing process"; @@ -51,4 +38,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ pancaek ]; platforms = [ "x86_64-linux" ]; }; -}) +}