From e42262d876f283c1068f43d8b0843f25a7826559 Mon Sep 17 00:00:00 2001 From: misumisumi Date: Tue, 10 Oct 2023 14:22:17 +0900 Subject: [PATCH] fix(nixos): Add go lang. --- nixos/neovim/default.nix | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/nixos/neovim/default.nix b/nixos/neovim/default.nix index e80d84c8d..74498b658 100644 --- a/nixos/neovim/default.nix +++ b/nixos/neovim/default.nix @@ -66,20 +66,20 @@ in # Inspired from https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/programs/nix-ld.nix build-dependent-pkgs = with pkgs; [ - zlib - zstd - stdenv.cc.cc - curl - openssl + acl attr - libssh bzip2 - libxml2 - acl + curl libsodium + libssh + libxml2 + openssl + stdenv.cc.cc + systemd util-linux xz - systemd + zlib + zstd # Packages not included in `nix-ld`'s NixOSModule glib libcxx @@ -127,7 +127,12 @@ in }; home.packages = with pkgs; [ ripgrep - ] ++ optionals cfg.setBuildEnv [ patchelf nvim-depends-library nvim-depends-include nvim-depends-pkgconfig ]; + ] ++ optionals cfg.setBuildEnv [ + nvim-depends-include + nvim-depends-library + nvim-depends-pkgconfig + patchelf + ]; home.extraOutputsToInstall = optional cfg.setBuildEnv "nvim-depends"; home.shellAliases.nvim = optionalString cfg.setBuildEnv (concatStringsSep " " buildEnv) + " SQLITE_CLIB_PATH=${pkgs.sqlite.out}/lib/libsqlite3.so " + "nvim"; @@ -145,13 +150,14 @@ in sqlite ] ++ optionals cfg.withBuildTools [ - pkg-config + cargo clang - gcc cmake + gcc gnumake + go ninja - cargo + pkg-config yarn ] ++ optionals cfg.withHaskell [ @@ -167,8 +173,8 @@ in ]; extraPython3Packages = ps: with ps; [ - isort docformatter + isort pynvim ]; extraLuaPackages = ls: with ls; [