diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23dbac70fc04..85f590166c0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3286,6 +3286,12 @@ { fingerprint = "8916 F727 734E 77AB 437F A33A 19AB 76F5 CEE1 1392"; } ]; }; + CaiqueFigueiredo = { + email = "public@caiquefigueiredo.me"; + github = "caiquefigueiredo"; + githubId = 20440897; + name = "Caique"; + }; CaitlinDavitt = { email = "CaitlinDavitt@gmail.com"; github = "CaitlinDavitt"; diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 377abd03d3b0..08da3009f6bb 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -1,8 +1,12 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + darwin, + libiconv, }: let pname = "asm-lsp"; @@ -18,13 +22,14 @@ rustPlatform.buildRustPackage { hash = "sha256-0GB3tXZuCu3syh+RG+eXoliZVHMPOhYC3RchSSx4u5w="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; @@ -37,8 +42,11 @@ rustPlatform.buildRustPackage { description = "Language server for NASM/GAS/GO Assembly"; homepage = "https://github.com/bergercookie/asm-lsp"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ NotAShelf ]; + maintainers = with lib.maintainers; [ + NotAShelf + CaiqueFigueiredo + ]; mainProgram = "asm-lsp"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }