From b0142c822bfe03e28699a31436fcd5f64e50ae8f Mon Sep 17 00:00:00 2001 From: James Smith Date: Tue, 14 Dec 2021 16:46:06 -0700 Subject: [PATCH] nongnu: broadcom-sta: Fix build failure for x86_64-linux. Fixes https://gitlab.com/nonguix/nonguix/-/issues/152 * nongnu/packages/linux.scm (broadcom-sta)[native-inputs]: Remove arch decision logic and... [source]: move it here. [arguments]: Remove 'unpack phase as done by build system now. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index bfbb577..474e58b 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -598,25 +598,15 @@ network adapters.") (package (name "broadcom-sta") (version broadcom-sta-version) - (source #f) + (source + (match (or (%current-target-system) (%current-system)) + ("x86_64-linux" broadcom-sta-x86_64-source) + (_ broadcom-sta-i686-source))) (build-system linux-module-build-system) (arguments `(#:linux ,linux - #:tests? #f - #:phases - (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key inputs #:allow-other-keys) - (let ((source (assoc-ref inputs "broadcom-sta-source"))) - (invoke "tar" "xf" source) - (chdir ((@@ (guix build gnu-build-system) first-subdirectory) ".")) - #t)))))) + #:tests? #f)) (supported-systems '("i686-linux" "x86_64-linux")) - (native-inputs - `(("broadcom-sta-source" - ,(match (or (%current-target-system) (%current-system)) - ("x86_64-linux" broadcom-sta-x86_64-source) - (_ broadcom-sta-i686-source))))) (home-page "https://www.broadcom.com/support/802.11") (synopsis "Broadcom 802.11 Linux STA wireless driver") (description "This package contains Broadcom's IEEE 802.11a/b/g/n/ac hybrid