From 2898d1318c59b06b33bdabdfcb092e9c3b5c1a10 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 24 Jul 2024 17:23:14 -0400 Subject: [PATCH] Get busybox to the functional tests --- flake.nix | 1 + tests/functional/package.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2384c29741b..03520988ae0 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/tests/functional/package.nix b/tests/functional/package.nix index c0459667278..4f53344a15b 100644 --- a/tests/functional/package.nix +++ b/tests/functional/package.nix @@ -20,6 +20,8 @@ , gtest , runCommand +, busybox-sandbox-shell ? null + # Configuration Options , version @@ -43,7 +45,8 @@ mkMesonDerivation (finalAttrs: { ./. ]; - nativeBuildInputs = [ + # Hack for sake of the dev shell + passthru.baseNativeBuildInputs = [ meson ninja pkg-config @@ -52,7 +55,11 @@ mkMesonDerivation (finalAttrs: { jq git mercurial + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + busybox-sandbox-shell + ]; + nativeBuildInputs = finalAttrs.baseNativeBuildInputs ++ [ nix-ng ];