From 6e577ff4047593b0917604f81c9788e48bfabe91 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Aug 2022 21:46:55 -0400 Subject: [PATCH 1/2] =?UTF-8?q?texlab:=204.2.0=20=E2=86=92=204.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/misc/texlab/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 229c2b68f62b..00d12e182831 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 @@ -11,24 +12,34 @@ 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" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + help2man + installShellFiles + ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + CoreServices + ]; postInstall = '' + # 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 # Remove generated dylib of human_name dependency. TexLab statically From f3c62556212130413411dcaad4af680f150ac8eb Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 10 Aug 2022 20:10:01 -0400 Subject: [PATCH 2/2] texlab: fix cross-compilation --- .../development/tools/misc/texlab/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 00d12e182831..4371efca4f0a 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -10,7 +10,9 @@ , nix-update-script }: -rustPlatform.buildRustPackage rec { +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in rustPlatform.buildRustPackage rec { pname = "texlab"; version = "4.2.1"; @@ -23,12 +25,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A="; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (!isCross) "man"; - nativeBuildInputs = [ - help2man - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optional (!isCross) help2man; buildInputs = lib.optionals stdenv.isDarwin [ libiconv @@ -37,17 +37,20 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - # 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 - # 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 {