From fa25edac5b9a0621890ee927d532a2cc99bad878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= Date: Mon, 21 Oct 2024 09:58:23 +0200 Subject: [PATCH] nushell: fix build on darwin --- pkgs/shells/nushell/plugins/default.nix | 4 ++-- pkgs/shells/nushell/plugins/highlight.nix | 7 ++++++- pkgs/shells/nushell/plugins/units.nix | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index 7aa271e82e3b..f0f998be7443 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -7,7 +7,7 @@ lib.makeScope newScope (self: with self; { query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; - units = callPackage ./units.nix { }; - highlight = callPackage ./highlight.nix { }; + units = callPackage ./units.nix { inherit IOKit Foundation; }; + highlight = callPackage ./highlight.nix { inherit IOKit Foundation; }; dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; }; }) diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index fbd37e432b49..a63ba5e7f82f 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -5,6 +5,8 @@ pkg-config, nix-update-script, fetchFromGitHub, + IOKit, + Foundation, }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + Foundation + ]; cargoBuildFlags = [ "--package nu_plugin_highlight" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index ffb231c2bec0..0bc8304a49bd 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -5,6 +5,8 @@ pkg-config, nix-update-script, fetchFromGitHub, + IOKit, + Foundation, }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pxA+6E5luFHq/N0K/8Xk2LapwDnPqDUEpTYqP/jcc3s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + Foundation + ]; cargoBuildFlags = [ "--package nu_plugin_units" ]; passthru.updateScript = nix-update-script { };