Unverified Commit fa25edac authored by Joaquín Triñanes's avatar Joaquín Triñanes
Browse files

nushell: fix build on darwin

parent 9455dd1c

pkgs/shells/nushell/plugins/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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; };

})

pkgs/shells/nushell/plugins/highlight.nix

+6 −1
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/shells/nushell/plugins/units.nix

+6 −1
Original line number Diff line number Diff line
@@ -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 { };