Unverified Commit 6b2b7cdf authored by Yt's avatar Yt Committed by GitHub
Browse files

Merge pull request #304663 from wegank/bindgen-1 

nushellPlugins: use rustPlatform.bindgenHook
parents 30f042a2 61250116

pkgs/shells/nushell/plugins/formats.nix

+2 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, pkg-config

, IOKit

, Foundation

, libclang

, nix-update-script

}:
@@ -14,10 +13,8 @@ rustPlatform.buildRustPackage rec { 
  inherit (nushell) version src;

  cargoHash = "sha256-mInMs0kAJn3/fgRAG0E8hgvaly2G68kT5O+D83pLq78=";



  env = lib.optionalAttrs stdenv.cc.isClang {

    LIBCLANG_PATH = "${libclang.lib}/lib";

  };

  nativeBuildInputs = [ pkg-config ];

  nativeBuildInputs = [ pkg-config ]

    ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];

  buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ];

  cargoBuildFlags = [ "--package nu_plugin_formats" ];

pkgs/shells/nushell/plugins/gstat.nix

+2 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, nushell

, pkg-config

, Security

, libclang

, nix-update-script

}:
@@ -14,10 +13,8 @@ rustPlatform.buildRustPackage rec { 
  inherit (nushell) version src;

  cargoHash = "sha256-1HfuMtjtUzwsIxkYV8azttnjEyAnC7X1aMIdw2N0yxQ=";



  env = lib.optionalAttrs stdenv.cc.isClang {

    LIBCLANG_PATH = "${libclang.lib}/lib";

  };

  nativeBuildInputs = [ pkg-config ];

  nativeBuildInputs = [ pkg-config ]

    ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];

  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];

  cargoBuildFlags = [ "--package nu_plugin_gstat" ];

pkgs/shells/nushell/plugins/query.nix

+1 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
, nushell

, IOKit

, CoreFoundation

, libclang

, nix-update-script

}:
@@ -13,9 +12,7 @@ rustPlatform.buildRustPackage { 
  inherit (nushell) version src;

  cargoHash = "sha256-takIDfMriDzZT/9JkqWPis10EaZhfwGpi7EkoOh4+vw=";



  env = lib.optionalAttrs stdenv.cc.isClang {

    LIBCLANG_PATH = "${libclang.lib}/lib";

  };

  nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];

  buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];

  cargoBuildFlags = [ "--package nu_plugin_query" ];

pkgs/top-level/all-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -27713,7 +27713,8 @@ with pkgs; 
  nu_scripts = callPackage ../shells/nushell/nu_scripts { };















  nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins {













    inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation Security;













    inherit (darwin.apple_sdk.frameworks) Security;













    inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation;















  });





























  nettools = if stdenv.isLinux