gnu: gnome-shell: Avoid top-level reference to inkscape.
Fixes <https://bugs.gnu.org/34806>. Reported by Marius Bakke <mbakke@fastmail.com>. * gnu/packages/gnome.scm (gnome-shell)[source](snippet): Remove reference to INKSCAPE. Instead, simply copy the SVG file to data/theme. [arguments]: Add 'convert-logo-to-png' phase. [native-inputs]: Add INKSCAPE.
This commit is contained in:
parent
5ae5932b2f
commit
45fef894eb
|
@ -5695,10 +5695,9 @@ properties, screen resolution, and other GNOME parameters.")
|
||||||
(copy-file #$(file-append %artwork-repository
|
(copy-file #$(file-append %artwork-repository
|
||||||
"/slim/0.x/background.png")
|
"/slim/0.x/background.png")
|
||||||
"data/theme/guix-background.png")
|
"data/theme/guix-background.png")
|
||||||
(invoke #+(file-append inkscape "/bin/inkscape")
|
(copy-file #$(file-append %artwork-repository
|
||||||
"--export-png=data/theme/guix-logo.png"
|
"/logo/Guix-horizontal-white.svg")
|
||||||
#$(file-append %artwork-repository
|
"data/theme/guix-logo.svg")
|
||||||
"/logo/Guix-horizontal-white.svg"))
|
|
||||||
#t))))
|
#t))))
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -5711,6 +5710,11 @@ properties, screen resolution, and other GNOME parameters.")
|
||||||
(invoke "make" "-C" "data"
|
(invoke "make" "-C" "data"
|
||||||
"theme/gnome-shell.css"
|
"theme/gnome-shell.css"
|
||||||
"theme/gnome-shell-high-contrast.css")))
|
"theme/gnome-shell-high-contrast.css")))
|
||||||
|
(add-before 'build 'convert-logo-to-png
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
;; Convert the logo from SVG to PNG.
|
||||||
|
(invoke "inkscape" "--export-png=data/theme/guix-logo.png"
|
||||||
|
"data/theme/guix-logo.svg")))
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
@ -5741,7 +5745,8 @@ properties, screen resolution, and other GNOME parameters.")
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("python" ,python)
|
("python" ,python)
|
||||||
("xsltproc" ,libxslt)
|
("xsltproc" ,libxslt)
|
||||||
("ruby-sass" ,ruby-sass)))
|
("ruby-sass" ,ruby-sass)
|
||||||
|
("inkscape" ,inkscape)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("accountsservice" ,accountsservice)
|
`(("accountsservice" ,accountsservice)
|
||||||
("caribou" ,caribou)
|
("caribou" ,caribou)
|
||||||
|
|
Loading…
Reference in New Issue