From bf39f5b9dca46ae71a8d457096b72d7258833f71 Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 3 Apr 2022 11:28:47 -0700 Subject: [PATCH] b43Firmware: support cross compile --- .../linux/firmware/b43-firmware-cutter/default.nix | 5 ++++- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 2 +- pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 389078db0af5..fe7a3e9ae406 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./no-root-install.patch ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; meta = { description = "Firmware extractor for cards supported by the b43 kernel module"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 3f810fd93a1c..98d793c5d998 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi"; }; - buildInputs = [ b43FirmwareCutter ]; + nativeBuildInputs = [ b43FirmwareCutter ]; installPhase = '' mkdir -p $out/lib/firmware diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 1116d96a637f..622b89b1baea 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50"; }; - buildInputs = [ b43FirmwareCutter ]; + nativeBuildInputs = [ b43FirmwareCutter ]; sourceRoot = ".";