amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: udisks: Rewrite using G-Expressions.

Browse source 
* gnu/packages/freedesktop.scm (udisks)[arguments]: Rewrite using
G-Expressions. Drop trailing #t.
[native-inputs]: Drop labels.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Bruno Victal 2023-10-09 21:06:17 +01:00 • committed by Ludovic Courtès
parent 796b78d684
commit 1eba27f29a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 58 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

120
gnu/packages/freedesktop.scm
View file

@ -1737,15 +1737,15 @@ Analysis and Reporting Technology) functionality.")
"06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj")))) "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages (list docbook-xml-4.3 ; to build the manpages
("docbook-xsl" ,docbook-xsl) docbook-xsl
("glib:bin" ,glib "bin") ; for glib-mkenums `(,glib "bin") ; for glib-mkenums
("gnome-common" ,gnome-common) ; TODO: Why is this needed? gnome-common ; TODO: Why is this needed?
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk-doc" ,gtk-doc/stable) gtk-doc/stable
("intltool" ,intltool) intltool
("pkg-config" ,pkg-config) pkg-config
("xsltproc" ,libxslt))) libxslt))
(propagated-inputs (propagated-inputs
(list glib)) ; required by udisks2.pc (list glib)) ; required by udisks2.pc
(inputs (inputs
@ -1763,59 +1763,55 @@ Analysis and Reporting Technology) functionality.")
(outputs '("out" (outputs '("out"
"doc")) ;5 MiB of gtk-doc HTML "doc")) ;5 MiB of gtk-doc HTML
(arguments (arguments
`(#:tests? #f ; requiring system message dbus (list
#:disallowed-references ("doc") ;enforce separation of "doc" #:tests? #f ; requiring system message dbus
#:configure-flags #:disallowed-references '("doc") ;enforce separation of "doc"
(list "--enable-man" #:configure-flags
"--enable-available-modules" ; Such as lvm2, btrfs, etc. #~(list "--enable-man"
"--localstatedir=/var" "--enable-available-modules" ; Such as lvm2, btrfs, etc.
"--enable-fhs-media" ;mount devices in /media, not /run/media "--localstatedir=/var"
(string-append "--with-html-dir=" "--enable-fhs-media" ;mount devices in /media, not /run/media
(assoc-ref %outputs "doc") (string-append "--with-html-dir=" #$output:doc
"/share/doc/udisks/html") "/share/doc/udisks/html")
(string-append "--with-udevdir=" %output "/lib/udev")) (string-append "--with-udevdir=" #$output "/lib/udev"))
#:make-flags #:make-flags
(let* ((docbook-xsl-name-version ,(string-append #~(let* ((docbook-xsl-name-version
(package-name docbook-xsl) "-" #$(string-append (package-name docbook-xsl) "-"
(package-version docbook-xsl))) (package-version docbook-xsl)))
(docbook-xsl-catalog-file (string-append (docbook-xsl-catalog-file
(assoc-ref %build-inputs "docbook-xsl") (string-append #$(this-package-native-input "docbook-xsl")
"/xml/xsl/" "/xml/xsl/" docbook-xsl-name-version
docbook-xsl-name-version "/catalog.xml"))
"/catalog.xml")) (docbook-xml-catalog-file
(docbook-xml-catalog-file (string-append #$(file-append (this-package-native-input "docbook-xml")
(assoc-ref %build-inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))
"/xml/dtd/docbook/catalog.xml"))) ;; Reference the catalog files required to build the manpages.
;; Reference the catalog files required to build the manpages. (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file
(list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file " " " " docbook-xml-catalog-file)))
docbook-xml-catalog-file))) #:phases
#:phases #~(modify-phases %standard-phases
(modify-phases %standard-phases (add-before 'configure 'fix-girdir
(add-before (lambda _
'configure 'fix-girdir ;; Install introspection data to its own output.
(lambda _ (substitute* "udisks/Makefile.in"
;; Install introspection data to its own output. (("girdir = .*")
(substitute* "udisks/Makefile.in" "girdir = $(datadir)/gir-1.0\n")
(("girdir = .*") (("typelibsdir = .*")
"girdir = $(datadir)/gir-1.0\n") "typelibsdir = $(libdir)/girepository-1.0\n"))))
(("typelibsdir = .*") (add-after 'install 'wrap-udisksd
"typelibsdir = $(libdir)/girepository-1.0\n")))) (lambda _
(add-after 'install 'wrap-udisksd ;; Tell 'udisksd' where to find the 'mount' command.
(lambda* (#:key outputs inputs #:allow-other-keys) (let ((utils #$(this-package-input "util-linux"))
;; Tell 'udisksd' where to find the 'mount' command. (cryptsetup #$(this-package-input "cryptsetup"))
(let ((out (assoc-ref outputs "out")) (parted #$(this-package-input "parted")))
(utils (assoc-ref inputs "util-linux")) (wrap-program (string-append #$output "/libexec/udisks2/udisksd")
(cryptsetup (assoc-ref inputs "cryptsetup")) `("PATH" ":" prefix
(parted (assoc-ref inputs "parted"))) (,(string-append utils "/bin") ;for 'mount'
(wrap-program (string-append out "/libexec/udisks2/udisksd") ;; cryptsetup is required for setting encrypted
`("PATH" ":" prefix ;; partitions, e.g. in gnome-disks
(,(string-append utils "/bin") ;for 'mount' ,(string-append cryptsetup "/sbin")
;; cryptsetup is required for setting encrypted "/run/current-system/profile/bin"
;; partitions, e.g. in gnome-disks "/run/current-system/profile/sbin")))))))))
,(string-append cryptsetup "/sbin")
"/run/current-system/profile/bin"
"/run/current-system/profile/sbin")))
#t))))))
(home-page "https://www.freedesktop.org/wiki/Software/udisks/") (home-page "https://www.freedesktop.org/wiki/Software/udisks/")
(synopsis "Disk manager service") (synopsis "Disk manager service")
(description (description