Skip to content

Commit e337131

Browse files
committed
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`.
1 parent 8d64225 commit e337131

File tree

1 file changed

+1
-2
lines changed
  • pkgs/os-specific/linux/firmware/linux-firmware

1 file changed

+1
-2
lines changed

pkgs/os-specific/linux/firmware/linux-firmware/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{ stdenvNoCC
22
, fetchzip
3-
, findutils
43
, lib
54
, python3
65
, rdfind
@@ -13,7 +12,7 @@ let
1312
# in a perfectly pristine tree, so we can fake just enough of git to run it.
1413
gitStub = writeShellScriptBin "git" ''
1514
if [ "$1" == "ls-files" ]; then
16-
${lib.getExe findutils} -type f -printf "%P\n"
15+
find -type f -printf "%P\n"
1716
else
1817
echo "Git stub called with unexpected arguments $@" >&2
1918
exit 1

0 commit comments

Comments
 (0)