1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-10-18 00:16:11 -04:00

Rename baseNativeBuildInputs

as requested

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
This commit is contained in:
John Ericson 2024-10-09 10:39:18 -04:00
parent c8d49993ec
commit 57a478572d
2 changed files with 3 additions and 3 deletions

View file

@ -351,7 +351,7 @@
++ lib.optionals havePerl pkgs.nixComponents.nix-perl-bindings.nativeBuildInputs ++ lib.optionals havePerl pkgs.nixComponents.nix-perl-bindings.nativeBuildInputs
++ pkgs.nixComponents.nix-internal-api-docs.nativeBuildInputs ++ pkgs.nixComponents.nix-internal-api-docs.nativeBuildInputs
++ pkgs.nixComponents.nix-external-api-docs.nativeBuildInputs ++ pkgs.nixComponents.nix-external-api-docs.nativeBuildInputs
++ pkgs.nixComponents.nix-functional-tests.baseNativeBuildInputs ++ pkgs.nixComponents.nix-functional-tests.externalNativeBuildInputs
++ lib.optional ++ lib.optional
(!buildCanExecuteHost (!buildCanExecuteHost
# Hack around https://github.com/nixos/nixpkgs/commit/bf7ad8cfbfa102a90463433e2c5027573b462479 # Hack around https://github.com/nixos/nixpkgs/commit/bf7ad8cfbfa102a90463433e2c5027573b462479

View file

@ -48,7 +48,7 @@ mkMesonDerivation (finalAttrs: {
]; ];
# Hack for sake of the dev shell # Hack for sake of the dev shell
passthru.baseNativeBuildInputs = [ passthru.externalNativeBuildInputs = [
meson meson
ninja ninja
pkg-config pkg-config
@ -66,7 +66,7 @@ mkMesonDerivation (finalAttrs: {
util-linux util-linux
]; ];
nativeBuildInputs = finalAttrs.passthru.baseNativeBuildInputs ++ [ nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
nix-cli nix-cli
]; ];