chore: remove monolithic coreutils requirement

It's only used in a couple of tests, and only in such a way that
replacing it with a random command suffices.
I also removed a few pointless uses of the variable.

Fixes: lix-project/lix#376
Change-Id: I90aedb61d64b02f7c9b007e72f9d614cc1b37a2e
This commit is contained in:
V. 2024-10-25 15:19:52 +04:00
parent 2734a9cf94
commit fb1b211037
7 changed files with 18 additions and 5 deletions

View file

@ -141,6 +141,11 @@ valentin:
display_name: Valentin Gagarin display_name: Valentin Gagarin
github: fricklerhandwerk github: fricklerhandwerk
vigress8:
display_name: Vigress
forgejo: vigress8
github: vigress8
winter: winter:
forgejo: winter forgejo: winter
github: winterqt github: winterqt

View file

@ -0,0 +1,8 @@
---
synopsis: "Dependency on monolithic coreutils removed"
category: Development
cls: [2108]
credits: vigress8
---
Previously, the build erroneously depended on a `coreutils` binary, which requires `coreutils` to be built with a specific configuration. This was only used in one test and was not required to be a single binary. This dependency is removed now.

View file

@ -358,7 +358,6 @@ endif
# #
# Build-time tools # Build-time tools
# #
coreutils = find_program('coreutils', native : true)
dot = find_program('dot', required : false, native : true) dot = find_program('dot', required : false, native : true)
pymod = import('python') pymod = import('python')
python = pymod.find_installation('python3') python = pymod.find_installation('python3')

View file

@ -1,6 +1,6 @@
source common.sh source common.sh
sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh
user=$(whoami || echo -n nixbld) user=$(whoami || echo -n nixbld)
rm -rf $TEST_HOME $TEST_ROOT/profile-var rm -rf $TEST_HOME $TEST_ROOT/profile-var

View file

@ -44,7 +44,6 @@ DAEMON_PATH="$PATH"
if [[ -n "${NIX_DAEMON_PACKAGE:-}" ]]; then if [[ -n "${NIX_DAEMON_PACKAGE:-}" ]]; then
DAEMON_PATH="${NIX_DAEMON_PACKAGE}/bin:$DAEMON_PATH" DAEMON_PATH="${NIX_DAEMON_PACKAGE}/bin:$DAEMON_PATH"
fi fi
coreutils=@coreutils@
lsof=@lsof@ lsof=@lsof@
export dot=@dot@ export dot=@dot@

View file

@ -10,7 +10,7 @@ in
rec { rec {
shell = "@bash@"; shell = "@bash@";
path = "@coreutils@"; path = "@ls@";
system = "@system@"; system = "@system@";

View file

@ -1,6 +1,8 @@
ls = find_program('ls', native : true)
test_confdata = { test_confdata = {
'bindir': bindir, 'bindir': bindir,
'coreutils': fs.parent(coreutils.full_path()), 'ls': fs.parent(ls.full_path()),
'lsof': lsof.full_path(), 'lsof': lsof.full_path(),
'dot': dot.found() ? dot.full_path() : '', 'dot': dot.found() ? dot.full_path() : '',
'bash': bash.full_path(), 'bash': bash.full_path(),