diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-11-30 17:58:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2016-11-30 18:25:57 +0100 |
| commit | 35bbe88b3c12402bd0648f1ce15a2977742f70a2 (patch) | |
| tree | 6a833e062e7fb26bf250313db1bbc8a701fb150c /gnu/packages/xdisorg.scm | |
| parent | 8a7cbc882a75d7f9f1fe960552dea47acf347b0a (diff) | |
| download | guix-35bbe88b3c12402bd0648f1ce15a2977742f70a2.tar guix-35bbe88b3c12402bd0648f1ce15a2977742f70a2.tar.gz | |
gnu: pixman: Eliminate graft.
* gnu/packages/xdisorg.scm (pixman)[replacement]: Remove field.
[source]: Add patch from 'pixman/fixed'.
(pixman/fixed): Remove variable.
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 3d1108d42e..4633b5159e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -241,7 +241,6 @@ following the mouse.") (package (name "pixman") (version "0.34.0") - (replacement pixman/fixed) (source (origin (method url-fetch) (uri (string-append @@ -249,7 +248,8 @@ following the mouse.") version ".tar.gz")) (sha256 (base32 - "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1")))) + "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1")) + (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (inputs `(("libpng" ,libpng) @@ -263,14 +263,6 @@ manipulation, providing features such as image compositing and trapezoid rasterisation.") (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 (package (name "libdrm") |