TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: gnome-shell: Avoid top-level reference to inkscape.

Browse source 
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:
Ludovic Courtès 2019-03-10 23:29:39 +01:00
parent 5ae5932b2f
commit 45fef894eb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/gnome.scm
View file

@ -5695,10 +5695,9 @@ (define-public gnome-shell
(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 @@ (define-public gnome-shell
(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 @@ (define-public gnome-shell
("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)