From 57a0a84398c62cbd2af35307cdf7749e25b6e7c2 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 16 Apr 2025 22:34:25 +0200 Subject: [PATCH] wrapped programs: switch to nativeBuildInputs --- modules/programs/gui/foot.nix | 2 +- modules/programs/tui/btop.nix | 2 +- modules/services/mako/module.nix | 2 +- packages/helix.nix | 2 +- packages/shell/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 8aed3ea..5568d7b 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -118,7 +118,7 @@ foot-wrapped = pkgs.symlinkJoin { name = "foot-wrapped"; paths = [pkgs.foot]; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/foot --add-flags "--config=${foot-config} --working-directory=/home/${username}" ''; diff --git a/modules/programs/tui/btop.nix b/modules/programs/tui/btop.nix index df1d29b..886b43f 100644 --- a/modules/programs/tui/btop.nix +++ b/modules/programs/tui/btop.nix @@ -27,7 +27,7 @@ btop-wrapped = pkgs.symlinkJoin { name = "btop-wrapped"; paths = [pkgs.btop]; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/btop --set XDG_CONFIG_HOME "${btop-settings}" ''; diff --git a/modules/services/mako/module.nix b/modules/services/mako/module.nix index 4bbdc0e..52eba30 100644 --- a/modules/services/mako/module.nix +++ b/modules/services/mako/module.nix @@ -2,7 +2,7 @@ mako-wrapped = pkgs.symlinkJoin { name = "mako-wrapped"; paths = [pkgs.mako]; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/mako --add-flags "\ --font 'Lexend 11' \ diff --git a/packages/helix.nix b/packages/helix.nix index e07c6e3..2e0e111 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -309,7 +309,7 @@ # typst lsp vscode-langservers-extracted ]; - buildInputs = [makeWrapper]; + nativeBuildInputs = [makeWrapper]; postBuild = '' mkdir -p $out/config/helix cp "${toml.generate "config.toml" helix-config}" $out/config/helix/config.toml diff --git a/packages/shell/default.nix b/packages/shell/default.nix index 94dbc91..c6dd285 100644 --- a/packages/shell/default.nix +++ b/packages/shell/default.nix @@ -25,7 +25,7 @@ in (pkgs.symlinkJoin { name = "fish"; paths = [custom-fish] ++ packages; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ '';