From bba12afbce4d9f9ae3881b3fe36d77dd1fec3fb8 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 24 Apr 2022 20:48:52 +0200 Subject: [PATCH] fix(nix): separate default plugins (#1342) Separate default plugins from `nativeBuildInputs`, in order to minimize rebuilds. --- nix/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 4f967bfc..f001b2ec 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -61,11 +61,6 @@ flake-utils.lib.eachSystem [ # for openssl/openssl-sys pkgs.pkg-config - # default plugins - plugins.status-bar - plugins.tab-bar - plugins.strider - # generates manpages pkgs.mandown @@ -73,6 +68,12 @@ flake-utils.lib.eachSystem [ pkgs.copyDesktopItems ]; + defaultPlugins = [ + plugins.status-bar + plugins.tab-bar + plugins.strider + ]; + pluginNativeBuildInputs = [ pkgs.pkg-config # optimizes wasm binaries @@ -149,12 +150,12 @@ in rec { name src crate2nix - nativeBuildInputs desktopItems postInstall patchPhase meta ; + nativeBuildInputs = nativeBuildInputs ++ defaultPlugins; }; # native nixpkgs support - keep supported @@ -163,13 +164,13 @@ in rec { src name cargoLock - nativeBuildInputs buildInputs postInstall patchPhase desktopItems meta ; + nativeBuildInputs = nativeBuildInputs ++ defaultPlugins; }; packages.default = packages.zellij;