From faeb7ac63ade165aa94156e8983ede46295bf886 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 24 Aug 2023 20:15:00 +0200 Subject: [PATCH 1/2] emacsPackages.typst-mode: replace program --- .../editors/emacs/elisp-packages/melpa-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index e1d1c6abbfff..65b9c7b2889a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -535,6 +535,13 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); + typst-mode = super.typst-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace typst-mode.el \ + --replace 'typst-executable-location "typst"' 'typst-executable-location "${lib.getExe pkgs.typst}"' + ''; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; From d9a6e4d41bf6d20cb05af1827cef75a38c483dcb Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 26 Aug 2023 16:30:00 +0200 Subject: [PATCH 2/2] typst: set mainProgram --- pkgs/tools/typesetting/typst/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index adcbee4bb28e..66b0160c3632 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -49,5 +49,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/typst/typst/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ drupol figsoda kanashimia ]; + mainProgram = "typst"; }; }