Merge pull request #11976 from trofi/coreutils-by-ls

tests/functional/meson.build: always look up `ls` as a `coreutils` proxy
NixOS · Nov 27, 2024 · d467f7a · d467f7a
2 parents ad7e838 + 2679e55
commit d467f7a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
@@ -17,12 +17,10 @@ fs = import('fs')
 nix = find_program('nix')
 bash = find_program('bash', native : true)
 busybox = find_program('busybox', native : true, required : false)
-if host_machine.system() == 'windows'
-  # Because of the state of symlinks on Windows, coreutils.exe doesn't usually exist, but things like ls.exe will
-  coreutils = find_program('ls', native : true)
-else
-  coreutils = find_program('coreutils', native : true)
-endif
+# Look up `coreutils` package by searching for `ls` binary.
+# Previously we looked up `coreutils` on `linux`, but that is not
+# guaranteed to exist either.
+coreutils = find_program('ls', native : true)
 dot = find_program('dot', native : true, required : false)
 
 nix_bin_dir = fs.parent(nix.full_path())