gnu: emacs: Remove unneeded import.

[jackhill/guix/guix.git] / gnu / packages / firmware.scm

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 93f01b9..e0a162f 100644 (file)
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -92,7 +92,7 @@
                      ("cross-binutils" ,(cross-binutils "xtensa-elf" binutils-2.33))
                      ("cmake" ,cmake-minimal)
                      ("perl" ,perl)))
                      ("cross-binutils" ,(cross-binutils "xtensa-elf" binutils-2.33))
                      ("cmake" ,cmake-minimal)
                      ("perl" ,perl)))

-    (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc")
+    (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc")

     (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs")
     (description
      "This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB
     (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs")
     (description
      "This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB


@@ -320,7 +320,7 @@ coreboot.")
     (build-system gnu-build-system)
     (native-inputs
      `(("acpica" ,acpica)
     (build-system gnu-build-system)
     (native-inputs
      `(("acpica" ,acpica)

-       ("gcc" ,gcc-5)
+       ("gcc@5" ,gcc-5)

        ("nasm" ,nasm)
        ("python-2" ,python-2)
        ("util-linux" ,util-linux "lib")))
        ("nasm" ,nasm)
        ("python-2" ,python-2)
        ("util-linux" ,util-linux "lib")))


@@ -328,6 +328,18 @@ coreboot.")
      `(#:tests? #f ; No check target.
        #:phases
        (modify-phases %standard-phases
      `(#:tests? #f ; No check target.
        #:phases
        (modify-phases %standard-phases

+         ;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from
+         ;; shadowing the version of GCC provided in native-inputs.
+         (add-after 'set-paths 'hide-gcc7
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((gcc (assoc-ref inputs "gcc")))
+               (setenv "CPLUS_INCLUDE_PATH"
+                       (string-join
+                        (delete (string-append gcc "/include/c++")
+                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                              #\:))
+                        ":"))
+               #t)))

          (replace 'configure
            (lambda _
              (let* ((cwd (getcwd))
          (replace 'configure
            (lambda _
              (let* ((cwd (getcwd))


@@ -451,7 +463,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
 (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
   (package
     (name (string-append "arm-trusted-firmware-" platform))
 (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
   (package
     (name (string-append "arm-trusted-firmware-" platform))

-    (version "2.2")
+    (version "2.3")

     (source
       (origin
         (method git-fetch)
     (source
       (origin
         (method git-fetch)


@@ -460,11 +472,9 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
                (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/")
                (commit (string-append "v" version))))
         (file-name (git-file-name "arm-trusted-firmware" version))
                (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/")
                (commit (string-append "v" version))))
         (file-name (git-file-name "arm-trusted-firmware" version))

-        (patches (search-patches
-                  "arm-trusted-firmware-disable-hdcp.patch"))

        (sha256
         (base32
        (sha256
         (base32

-         "03fjl5hy1bqlya6fg553bqz7jrvilzrzpbs87cv6jd04v8qrvry8"))))
+         "113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"))))

     (build-system gnu-build-system)
     (arguments
      `(#:phases
     (build-system gnu-build-system)
     (arguments
      `(#:phases