From c9d7f30bcbd3a6e3076e56a972c33963c73c4d58 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 8 Jun 2021 19:02:49 +0200 Subject: [PATCH] nongnu: firefox: Raise llvm and clang to version 10. Fixes https://gitlab.com/nonguix/nonguix/-/issues/116. * nongnu/packages/mozilla.scm (firefox)[arguments]: Remove fix-swgl-build.rs phase as the workaround is not necessary anymore. [native-inputs]: Replace clang with clang-10. Dito for llvm. --- nongnu/packages/mozilla.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index e5ea8e9..5c9eb3a 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -142,11 +142,6 @@ ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - ;; See https://gitlab.com/nonguix/nonguix/-/issues/116 for details - (add-after 'unpack 'fix-swgl-build.rs - (lambda _ - (substitute* "gfx/wr/swgl/build.rs" - ((".flag\\(\"-ffast-math\"\\)") "")))) (add-after 'unpack 'fix-preferences (lambda* (#:key inputs #:allow-other-keys) (let ((port (open-file "browser/app/profile/firefox.js" "a"))) @@ -382,8 +377,8 @@ (native-inputs `(("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.47 "cargo") - ("clang" ,clang) - ("llvm" ,llvm) + ("clang" ,clang-10) + ("llvm" ,llvm-10) ("m4" ,m4) ("nasm" ,nasm) ("node" ,node)