gnu: gdk-pixbuf: Eliminate graft.
* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.3. [replacement]: Remove field. (gdk-pixbuf/fixed): Remove variable. (package/inherit): Remove macro. (gdk-pixbuf+svg): Remove use of 'package/inherit'.master
parent
e31677719b
commit
e60d3a5593
|
@ -425,8 +425,7 @@ highlighting and other features typical of a source code editor.")
|
||||||
(define-public gdk-pixbuf
|
(define-public gdk-pixbuf
|
||||||
(package
|
(package
|
||||||
(name "gdk-pixbuf")
|
(name "gdk-pixbuf")
|
||||||
(version "2.34.0")
|
(version "2.36.3")
|
||||||
(replacement gdk-pixbuf/fixed)
|
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
@ -434,7 +433,7 @@ highlighting and other features typical of a source code editor.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm"))))
|
"1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags '("--with-x11")
|
'(#:configure-flags '("--with-x11")
|
||||||
|
@ -475,35 +474,11 @@ in the GNOME project.")
|
||||||
(license license:lgpl2.0+)
|
(license license:lgpl2.0+)
|
||||||
(home-page "https://developer.gnome.org/gdk-pixbuf/")))
|
(home-page "https://developer.gnome.org/gdk-pixbuf/")))
|
||||||
|
|
||||||
(define gdk-pixbuf/fixed
|
|
||||||
(package (inherit gdk-pixbuf)
|
|
||||||
(name "gdk-pixbuf")
|
|
||||||
(version "2.36.3")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
|
||||||
(version-major+minor version) "/"
|
|
||||||
name "-" version ".tar.xz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj"))))
|
|
||||||
(replacement #f)))
|
|
||||||
|
|
||||||
(define-syntax-rule (package/inherit p overrides ...)
|
|
||||||
"Like (package (inherit P) OVERRIDES ...), except that the same
|
|
||||||
transformation is done to the package replacement, if any. P must be a bare
|
|
||||||
identifier, and will be bound to either P or its replacement when evaluating
|
|
||||||
OVERRIDES."
|
|
||||||
(let loop ((p p))
|
|
||||||
(package (inherit p)
|
|
||||||
overrides ...
|
|
||||||
(replacement (and=> (package-replacement p) loop)))))
|
|
||||||
|
|
||||||
;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
|
;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
|
||||||
;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the
|
;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the
|
||||||
;; closure size.
|
;; closure size.
|
||||||
(define-public gdk-pixbuf+svg
|
(define-public gdk-pixbuf+svg
|
||||||
(package/inherit gdk-pixbuf
|
(package (inherit gdk-pixbuf)
|
||||||
(name "gdk-pixbuf+svg")
|
(name "gdk-pixbuf+svg")
|
||||||
(inputs
|
(inputs
|
||||||
`(("librsvg" ,librsvg)
|
`(("librsvg" ,librsvg)
|
||||||
|
|
Loading…
Reference in New Issue