MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #293271 from nikstur/test-instrumentation-without-usr-bin-env

Browse source 
nixos/test-instrumentation: use full path to env
This commit is contained in:
Ryan Lahfa 2024-03-18 13:57:37 -07:00 committed by GitHub
commit ae07fcb07b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/testing/test-instrumentation.nix
View file

@ -42,8 +42,10 @@ let
# Otherwise we get errors on the terminal because bash tries to
# setup things like job control.
# Note: calling bash explicitly here instead of sh makes sure that
# we can also run non-NixOS guests during tests.
PS1= exec /usr/bin/env bash --norc /dev/hvc0
# we can also run non-NixOS guests during tests. This, however, is
# mostly futureproofing as the test instrumentation is still very
# tightly coupled to NixOS.
PS1= exec ${pkgs.coreutils}/bin/env bash --norc /dev/hvc0
'';
serviceConfig.KillSignal = "SIGHUP";
};
@ -121,7 +123,9 @@ in
}
];
contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env";
storePaths = [
"${pkgs.coreutils}/bin/env"
];
})
];