Skip to content

Commit

Permalink
linux-firmware: fix build when cross-compiling
Browse files Browse the repository at this point in the history
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`.

(cherry picked from commit e337131)
  • Loading branch information
jmbaur authored and github-actions[bot] committed Nov 8, 2024
1 parent 4b84260 commit f4ae669
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkgs/os-specific/linux/firmware/linux-firmware/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ stdenvNoCC
, fetchzip
, findutils
, lib
, python3
, rdfind
Expand All @@ -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
Expand Down

0 comments on commit f4ae669

Please sign in to comment.