From e33713134923c0f0d593597cd76086c36f4facf4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 19 Oct 2024 18:51:48 -0700 Subject: [PATCH] linux-firmware: fix build when cross-compiling Using `findutils` in such a way where `callPackage` cannot splice it to use the `buildPlatform`'s package-set breaks building `linux-firmware` when `buildPlatform` != `hostPlatform`. Since `findutils` is already included in all `stdenv.mkDerivation` calls, we can get rid of pulling in the different `findutils` and re-use the one that works on `buildPlatform`. --- pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index a3fa3f511b19..a1e13be4febe 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,6 +1,5 @@ { stdenvNoCC , fetchzip -, findutils , lib , python3 , rdfind @@ -13,7 +12,7 @@ let # in a perfectly pristine tree, so we can fake just enough of git to run it. gitStub = writeShellScriptBin "git" '' if [ "$1" == "ls-files" ]; then - ${lib.getExe findutils} -type f -printf "%P\n" + find -type f -printf "%P\n" else echo "Git stub called with unexpected arguments $@" >&2 exit 1