[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/14: gnu: iwd: Build from Git sources.
From: |
guix-commits |
Subject: |
12/14: gnu: iwd: Build from Git sources. |
Date: |
Tue, 8 Feb 2022 07:36:51 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 20516fbb9253304f5f46245283f70e1578a7a6b2
Author: Simon South <simon@simonsouth.net>
AuthorDate: Mon Feb 7 09:26:28 2022 -0500
gnu: iwd: Build from Git sources.
* gnu/packages/networking.scm (iwd)[source]: Use "git-fetch" and
"git-file-name".
[inputs]: Add ell source code.
[native-inputs]: Add autoconf, automake, libtool.
[arguments]<#:phases>: Add "copy-ell-header-files" phase to copy shared
header
files from ell source into source tree.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/networking.scm | 38 +++++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index ef0ae12e49..382b4cf96d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -47,6 +47,7 @@
;;; Copyright © 2021 Milkey Mouse <milkeymouse@meme.institute>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Simon South <simon@simonsouth.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3564,20 +3565,25 @@ powerful route filtering syntax and an easy-to-use
configuration interface.")
(name "iwd")
(version "1.20")
(source (origin
- ;; FIXME: We're using the bootstrapped sources because
- ;; otherwise using an external ell library is impossible.
- ;; How to bootstrap with Guix?
- (method url-fetch)
- (uri (string-append "https://www.kernel.org/pub/linux/network"
- "/wireless/iwd-" version ".tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url
"https://git.kernel.org/pub/scm/network/wireless/iwd.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "03q5scahyg86h4bdxqxm32shyssgpmfp5b3183j01ig7mg6f4lbx"))))
+ "0xlbnsgw9giakfj0xr526i7mcwyaryb18g66mv90njnrm8radjhr"))))
(build-system gnu-build-system)
(inputs
- (list dbus ell readline))
+ (list dbus ell (package-source ell) readline))
(native-inputs
- (list pkg-config python python-docutils openssl))
+ (list autoconf
+ automake
+ libtool
+ pkg-config
+ python
+ python-docutils
+ openssl))
(arguments
`(#:configure-flags
,#~(list "--disable-systemd-service"
@@ -3591,6 +3597,20 @@ powerful route filtering syntax and an easy-to-use
configuration interface.")
#$output "/share/dbus-1/system-services"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'copy-ell-header-files
+ ;; Copy into the source tree two of ell's private header files that
+ ;; it shares with iwd, as is required to build with the
+ ;; "--enable-external-ell" configure option.
+ ;; See the definition of "ell_shared" in iwd's Makefile.am.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((ell-header-dir (search-input-directory inputs "/ell"))
+ (target-dir "ell"))
+ (mkdir target-dir)
+ (for-each
+ (lambda (file-name)
+ (copy-file (string-append ell-header-dir "/" file-name)
+ (string-append target-dir "/" file-name)))
+ '("asn1-private.h" "useful.h")))))
(add-after 'configure 'patch-Makefile
(lambda _
(substitute* "Makefile"
- branch master updated (35d56676db -> 4be896d6e0), guix-commits, 2022/02/08
- 11/14: gnu: iwd: Remove reference to %outputs., guix-commits, 2022/02/08
- 07/14: gnu: Deprecate the 'g-golf' variable., guix-commits, 2022/02/08
- 09/14: gnu: nomad: Depends on proper version of g-golf., guix-commits, 2022/02/08
- 06/14: gnu: g-golf: Update to 0.0.1-1010-1824633., guix-commits, 2022/02/08
- 13/14: gnu: ell: Remove input labels., guix-commits, 2022/02/08
- 14/14: gnu: iwd: Update to 1.24., guix-commits, 2022/02/08
- 02/14: gnu: Add bloomberg-bde-tools., guix-commits, 2022/02/08
- 08/14: gnu: Add guile2.2-g-golf., guix-commits, 2022/02/08
- 12/14: gnu: iwd: Build from Git sources.,
guix-commits <=
- 01/14: import: utils: Harden beautify-description., guix-commits, 2022/02/08
- 04/14: gnu: Add emacs-spray., guix-commits, 2022/02/08
- 03/14: gnu: Add bloomberg-bde., guix-commits, 2022/02/08
- 05/14: gnu: Fix typo., guix-commits, 2022/02/08
- 10/14: gnu: iwd: Remove input labels., guix-commits, 2022/02/08