nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: pixman: Eliminate graft. 

* gnu/packages/xdisorg.scm (pixman)[replacement]: Remove field.
[source]: Add patch from 'pixman/fixed'.
(pixman/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2016-11-30 17:58:22 +01:00
parent 8a7cbc882a
commit 35bbe88b3c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/xdisorg.scm
View File

@ -241,7 +241,6 @@ following the mouse.")
(package (package
(name "pixman") (name "pixman")
(version "0.34.0") (version "0.34.0")
(replacement pixman/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -249,7 +248,8 @@ following the mouse.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1")))) "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1"))
(patches (search-patches "pixman-CVE-2016-5296.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libpng" ,libpng) `(("libpng" ,libpng)
@ -263,14 +263,6 @@ manipulation, providing features such as image compositing and trapezoid
rasterisation.") rasterisation.")
(license license:x11))) (license license:x11)))
(define pixman/fixed
(package
(inherit pixman)
(source (origin
(inherit (package-source pixman))
(patches (search-patches "pixman-CVE-2016-5296.patch"))))))
(define-public libdrm (define-public libdrm
(package (package
(name "libdrm") (name "libdrm")