From e7a0c7fc6a955f367b75acbe1eeaf4839a1fd975 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Mon, 20 Apr 2020 18:55:33 -0400 Subject: [PATCH] texlab: 1.10.0 -> 2.0.0 Also added a configurable wrapper that puts a TeX Distribution into PATH. Defaults to texlive.combined.scheme-small. Without this wrapper, the following message is displayed on startup: Your TeX distribution could not be detected. Please make sure that your distribution is in your PATH. --- .../development/tools/misc/texlab/default.nix | 8 ++++---- .../development/tools/misc/texlab/wrapper.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/misc/texlab/wrapper.nix diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 1edc86017ba68..11a2452f2941c 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "texlab"; - version = "1.10.0"; + pname = "texlab-unwrapped"; + version = "2.0.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i"; + sha256 = "0y8cv8y92a4nqwrvqk2cxgs6nspqjk8jm4spr8rgkwlpfbrg74xn"; }; - cargoSha256 = "08fi0c4s0d1p2rqxvj1y82zg6xl3n0ikgyhgrjwh6xay8f0121f0"; + cargoSha256 = "1cxi6bvdyhxb5jnw5dhba5mdsc149cw6mzaf00ayvc4pcdrj323s"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/misc/texlab/wrapper.nix b/pkgs/development/tools/misc/texlab/wrapper.nix new file mode 100644 index 0000000000000..35157cc30c073 --- /dev/null +++ b/pkgs/development/tools/misc/texlab/wrapper.nix @@ -0,0 +1,20 @@ +# Texlab supports the following TeX Distributions: +# - TeX Live +# - MiKTeX +# - Tectonic + +{ stdenvNoCC, lib, makeWrapper +, texlab-unwrapped, tex +}: + +stdenvNoCC.mkDerivation { + name = "texlab"; + inherit (texlab-unwrapped) version meta; + + phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + makeWrapper ${texlab-unwrapped}/bin/texlab "$out/bin/texlab" \ + --prefix PATH : ${lib.makeBinPath [ tex ]} + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef0e9fb151316..becb4a7140cfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10879,10 +10879,14 @@ in texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; - texlab = callPackage ../development/tools/misc/texlab { + texlab-unwrapped = callPackage ../development/tools/misc/texlab { inherit (darwin.apple_sdk.frameworks) Security; }; + texlab = callPackage ../development/tools/misc/texlab/wrapper.nix { + tex = texlive.combined.scheme-small; + }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { };