dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #304663 from wegank/bindgen-1

Browse Source 
nushellPlugins: use rustPlatform.bindgenHook
This commit is contained in:
Yt 2024-04-19 21:18:44 +00:00 committed by GitHub
commit 6b2b7cdf62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/shells/nushell/plugins/formats.nix
View File

@ -5,7 +5,6 @@
, pkg-config , pkg-config
, IOKit , IOKit
, Foundation , Foundation
, libclang
, nix-update-script , nix-update-script
}: }:
@ -14,10 +13,8 @@ rustPlatform.buildRustPackage rec {
inherit (nushell) version src; inherit (nushell) version src;
cargoHash = "sha256-mInMs0kAJn3/fgRAG0E8hgvaly2G68kT5O+D83pLq78="; cargoHash = "sha256-mInMs0kAJn3/fgRAG0E8hgvaly2G68kT5O+D83pLq78=";
env = lib.optionalAttrs stdenv.cc.isClang { nativeBuildInputs = [ pkg-config ]
LIBCLANG_PATH = "${libclang.lib}/lib"; ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
};
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ];
cargoBuildFlags = [ "--package nu_plugin_formats" ]; cargoBuildFlags = [ "--package nu_plugin_formats" ];

7
pkgs/shells/nushell/plugins/gstat.nix
View File

@ -5,7 +5,6 @@
, nushell , nushell
, pkg-config , pkg-config
, Security , Security
, libclang
, nix-update-script , nix-update-script
}: }:
@ -14,10 +13,8 @@ rustPlatform.buildRustPackage rec {
inherit (nushell) version src; inherit (nushell) version src;
cargoHash = "sha256-1HfuMtjtUzwsIxkYV8azttnjEyAnC7X1aMIdw2N0yxQ="; cargoHash = "sha256-1HfuMtjtUzwsIxkYV8azttnjEyAnC7X1aMIdw2N0yxQ=";
env = lib.optionalAttrs stdenv.cc.isClang { nativeBuildInputs = [ pkg-config ]
LIBCLANG_PATH = "${libclang.lib}/lib"; ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cargoBuildFlags = [ "--package nu_plugin_gstat" ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ];

5
pkgs/shells/nushell/plugins/query.nix
View File

@ -4,7 +4,6 @@
, nushell , nushell
, IOKit , IOKit
, CoreFoundation , CoreFoundation
, libclang
, nix-update-script , nix-update-script
}: }:
@ -13,9 +12,7 @@ rustPlatform.buildRustPackage {
inherit (nushell) version src; inherit (nushell) version src;
cargoHash = "sha256-takIDfMriDzZT/9JkqWPis10EaZhfwGpi7EkoOh4+vw="; cargoHash = "sha256-takIDfMriDzZT/9JkqWPis10EaZhfwGpi7EkoOh4+vw=";
env = lib.optionalAttrs stdenv.cc.isClang { nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
LIBCLANG_PATH = "${libclang.lib}/lib";
};
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
cargoBuildFlags = [ "--package nu_plugin_query" ]; cargoBuildFlags = [ "--package nu_plugin_query" ];

3
pkgs/top-level/all-packages.nix
View File

@ -27713,7 +27713,8 @@ with pkgs;
nu_scripts = callPackage ../shells/nushell/nu_scripts { }; nu_scripts = callPackage ../shells/nushell/nu_scripts { };
nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins { 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 nettools = if stdenv.isLinux