From 89eb8efeb650d53085fa36f42b5615f6cf4717b6 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Wed, 11 Oct 2017 18:05:24 +0200 Subject: [PATCH] WIP fix bluez. --- gnu/packages/linux.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8ef7a105d..34230cd15 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3049,6 +3049,16 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append "--with-udevdir=" out "/lib/udev"))) #:phases (modify-phases %standard-phases + ,@(if (string=? (%current-system) "armhf-linux") + ;; This test fails unpredictably. + ;; TODO: skip it for all architectures. + `((add-before 'check 'skip-wonky-test + (lambda _ + (substitute* "unit/test-gatt.c" + (("tester_init\\(&argc, &argv\\);") "return 77;")) + #t))) + `()) + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3067,12 +3077,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append out "/lib/udev/hid2hci --method")) (("/sbin/udevadm") (string-append (assoc-ref inputs "eudev") "/bin/udevadm"))) - #t)))) - - ;; FIXME: Skip one test that segfaults on ARM. - ,@(if (string=? (%current-system) "armhf-linux") - '(#:make-flags '("XFAIL_TESTS=unit/test-gatt")) - '()))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal))) -- 2.14.2