diff options
author | Doron Behar <doron.behar@gmail.com> | 2022-08-11 19:01:17 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-11 19:01:17 +0300 |
commit | dab407a82079bc60835700e6f74ac1ba1e988b76 (patch) | |
tree | ce92551f70d3834373ed1eadbf57f028ba95dbb5 | |
parent | 51998bc19e3c5f69184114d560844b5237b7c543 (diff) | |
parent | f3c62556212130413411dcaad4af680f150ac8eb (diff) |
Merge pull request #186010 from kira-bruneau/texlab
-rw-r--r-- | pkgs/development/tools/misc/texlab/default.nix | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 229c2b68f62b..4371efca4f0a 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, help2man , installShellFiles , libiconv , Security @@ -9,34 +10,47 @@ , nix-update-script }: -rustPlatform.buildRustPackage rec { +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-oYM+OAYjQ8aNAryg0Cthj14BsxMFnOtz38XdUQZZolk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-za3TauhNoxGDphpY615EnTt46HpMgS+sYpBln/twefw="; }; - cargoSha256 = "sha256-TDGiqC9eNIJfLTc1R3nvE84rAsVE8jtTaeQbVNMeVgg="; + cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A="; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (!isCross) "man"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optional (!isCross) help2man; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + CoreServices + ]; postInstall = '' - installManPage texlab.1 - # Remove generated dylib of human_name dependency. TexLab statically # links to the generated rlib and doesn't reference the dylib. I # couldn't find any way to prevent building this by passing cargo flags. # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43 rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}" rmdir "$out/lib" + '' + # When we cross compile we cannot run the output executable to + # generate the man page + + lib.optionalString (!isCross) '' + # TexLab builds man page separately in CI: + # https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135 + help2man --no-info "$out/bin/texlab" > texlab.1 + installManPage texlab.1 ''; passthru.updateScript = nix-update-script { |