Skip to content

Commit

Permalink
Get busybox to the functional tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Ericson2314 committed Jul 24, 2024
1 parent 349a2ef commit 2898d13
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@
++ lib.optionals havePerl pkgs.nixComponents.nix-perl-bindings.nativeBuildInputs
++ pkgs.nixComponents.nix-internal-api-docs.nativeBuildInputs
++ pkgs.nixComponents.nix-external-api-docs.nativeBuildInputs
++ pkgs.nixComponents.nix-functional-tests.baseNativeBuildInputs
++ lib.optional
(!stdenv.buildPlatform.canExecute stdenv.hostPlatform
# Hack around https://github.com/nixos/nixpkgs/commit/bf7ad8cfbfa102a90463433e2c5027573b462479
Expand Down
9 changes: 8 additions & 1 deletion tests/functional/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
, gtest
, runCommand

, busybox-sandbox-shell ? null

# Configuration Options

, version
Expand All @@ -43,7 +45,8 @@ mkMesonDerivation (finalAttrs: {
./.
];

nativeBuildInputs = [
# Hack for sake of the dev shell
passthru.baseNativeBuildInputs = [
meson
ninja
pkg-config
Expand All @@ -52,7 +55,11 @@ mkMesonDerivation (finalAttrs: {
jq
git
mercurial
] ++ lib.optionals stdenv.hostPlatform.isLinux [
busybox-sandbox-shell
];

nativeBuildInputs = finalAttrs.baseNativeBuildInputs ++ [
nix-ng
];

Expand Down

0 comments on commit 2898d13

Please sign in to comment.