From ea8ced0c4c4c538e7e2c624cc6957c6969ffffbf Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Sun, 24 Nov 2024 08:38:09 -0600 Subject: [PATCH] sublime-merge: set meta.mainProgram This fixes running Sublime Merge with nix run. Run install hooks and remove excessive use of with lib. --- .../version-management/sublime-merge/common.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 3c6edb20297f..5398fe6b781b 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation (rec { installPhase = '' + runHook preInstall mkdir -p "$out/bin" makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" '' @@ -171,6 +172,7 @@ stdenv.mkDerivation (rec { mkdir -p "$out/share/icons/hicolor/$size/apps" ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps done + runHook postInstall ''; passthru = { @@ -205,12 +207,13 @@ stdenv.mkDerivation (rec { ]; }; - meta = with lib; { + meta = { description = "Git client from the makers of Sublime Text"; homepage = "https://www.sublimemerge.com"; - maintainers = with maintainers; [ zookatron ]; + mainProgram = "sublime_merge"; + maintainers = with lib.maintainers; [ zookatron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = [ "aarch64-linux" "x86_64-linux"