ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: crda: Update to 4.15.

Browse source 
* gnu/packages/linux.scm (crda): Update to 4.15.
[source]: Use GIT-FETCH and GIT-FILE-NAME.
[arguments]: Don't explicitly return #t from phases.
Slightly rename 'set-regulator-db-file-name phase.
This commit is contained in:
Tobias Geerinckx-Rice 2023-07-02 02:00:03 +02:00
parent c128ce94d9
commit 7629377556
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/linux.scm
View file

@ -4556,15 +4556,17 @@ (define-public wireless-tools
(define-public crda
(package
(name "crda")
(version "3.18")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/network/crda/"
"crda-" version ".tar.xz"))
(sha256
(base32
"1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23"))
(patches (search-patches "crda-optional-gcrypt.patch"))))
(version "4.15")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ajh8zx84p15y9wawh764zawniwn059iw9m32v56ajvkz9xbnkp2"))
(patches (search-patches "crda-optional-gcrypt.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -4572,8 +4574,7 @@ (define-public crda
(add-after 'unpack 'gzip-determinism
(lambda _
(substitute* "Makefile"
(("gzip") "gzip --no-name"))
#t))
(("gzip") "gzip --no-name"))))
,@(if (%current-target-system)
'((add-after
'unpack 'fix-pkg-config
@ -4581,18 +4582,13 @@ (define-public crda
(substitute*
"Makefile"
(("pkg-config")
(string-append target "-pkg-config")))
#t)))
(string-append target "-pkg-config"))))))
'())
(add-before
'build 'no-werror-no-ldconfig
(add-before 'build 'patch-Makefile
(lambda _
(substitute* "Makefile"
(("-Werror") "")
(("ldconfig") "true"))
#t))
(add-before
'build 'set-regulator-db-file-name
(("ldconfig") "true"))))
(add-before 'build 'set-regulatory-db-file-name
(lambda* (#:key native-inputs inputs #:allow-other-keys)
;; Tell CRDA where to find our database.
(let ((regdb (assoc-ref (or native-inputs inputs)
@ -4600,8 +4596,7 @@ (define-public crda
(substitute* "crda.c"
(("\"/lib/crda/regulatory.bin\"")
(string-append "\"" regdb
"/lib/crda/regulatory.bin\"")))
#t))))
"/lib/crda/regulatory.bin\"")))))))
#:test-target "verify"
#:make-flags (let ((out (assoc-ref %outputs "out"))
(regdb (assoc-ref %build-inputs "wireless-regdb")))