gnu: eudev: Remove bugfix variant.

* gnu/packages/linux.scm (eudev/btrfs-fix): Remove variable.
(eudev)[arguments]: Add phase patch-bindir-in-btrfs-rules.
* gnu/services/base.scm (<udev-configuration>, udev-service): Refer to EUDEV
instead of EUDEV/BTRFS-FIX.
This commit is contained in:
Marius Bakke 2020-03-14 13:19:06 +01:00
parent f77ab2abdf
commit d594963856
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 12 additions and 22 deletions

View file

@ -2871,6 +2871,16 @@ (define-public eudev
(or native-inputs inputs) "xsltproc")
"/bin/xsltproc")))
#t))
(add-before 'configure 'patch-bindir-in-btrfs-rules
(lambda* (#:key outputs #:allow-other-keys)
;; The "@bindir@" substitution incorrectly expands to a literal
;; "${exec_prefix}" (see <https://bugs.gnu.org/39926>). Work
;; around it.
(let ((out (assoc-ref outputs "out")))
(substitute* "rules/64-btrfs.rules.in"
(("@bindir@")
(string-append out "/bin")))
#t)))
(add-after 'install 'move-static-library
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -2927,26 +2937,6 @@ (define-public eudev
time.")
(license license:gpl2+)))
;; TODO: Merge with eudev on the next rebuild cycle.
(define-public eudev/btrfs-fix
(package/inherit
eudev
(version (string-append (package-version eudev) "-1"))
(arguments
(substitute-keyword-arguments (package-arguments eudev)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'configure 'patch-bindir-in-btrfs-rules
(lambda* (#:key outputs #:allow-other-keys)
;; The "@bindir@" substitution incorrectly expands to a literal
;; "${exec_prefix}" (see <https://bugs.gnu.org/39926>). Work
;; around it.
(let ((out (assoc-ref outputs "out")))
(substitute* "rules/64-btrfs.rules.in"
(("@bindir@")
(string-append out "/bin")))
#t)))))))))
(define-public eudev-with-hwdb
(deprecated-package "eudev-with-hwdb" eudev))

View file

@ -1918,7 +1918,7 @@ (define-record-type* <udev-configuration>
udev-configuration make-udev-configuration
udev-configuration?
(udev udev-configuration-udev ;<package>
(default eudev/btrfs-fix))
(default eudev))
(rules udev-configuration-rules ;list of <package>
(default '())))
@ -2116,7 +2116,7 @@ (define udev-service-type
directory dynamically. Get extra rules from the packages listed in the
@code{rules} field of its value, @code{udev-configuration} object.")))
(define* (udev-service #:key (udev eudev/btrfs-fix) (rules '()))
(define* (udev-service #:key (udev eudev) (rules '()))
"Run @var{udev}, which populates the @file{/dev} directory dynamically. Get
extra rules from the packages listed in @var{rules}."
(service udev-service-type