Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

texlab: fix darwin build #123538

Merged
merged 1 commit into from
May 19, 2021
Merged

texlab: fix darwin build #123538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkgs/development/tools/misc/texlab/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
, rustPlatform
, fetchFromGitHub
, installShellFiles
, libiconv
, Security
, CoreServices
}:

rustPlatform.buildRustPackage rec {
Expand All @@ -23,7 +25,7 @@ rustPlatform.buildRustPackage rec {

nativeBuildInputs = [ installShellFiles ];

buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ];

postInstall = ''
installManPage texlab.1
Expand All @@ -32,9 +34,9 @@ rustPlatform.buildRustPackage rec {
# 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://gitlab.com/Kanedias/html2md/-/blob/0.2.10/Cargo.toml#L20
rm "$out/lib/libhtml2md.so"
rm "$out/lib/libhtml2md${stdenv.hostPlatform.extensions.sharedLibrary}"
rmdir "$out/lib"
'';
'';

meta = with lib; {
description = "An implementation of the Language Server Protocol for LaTeX";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13788,7 +13788,7 @@ in
texi2mdoc = callPackage ../tools/misc/texi2mdoc { };

texlab = callPackage ../development/tools/misc/texlab {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};

tflint = callPackage ../development/tools/analysis/tflint { };
Expand Down