From 4e45e352663f51d4b669256373819f8bc6fbd489 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 9 Oct 2013 16:18:23 +0200 Subject: snix: Prefer descriptions from the Womb rather than from Nixpkgs. * guix/snix.scm (snix-derivation->guix-package): Use 'gnu-package-doc-description' as the description for GNU packages. --- guix/snix.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'guix') diff --git a/guix/snix.scm b/guix/snix.scm index 04b5e7db2a..a77433bdc3 100644 --- a/guix/snix.scm +++ b/guix/snix.scm @@ -447,8 +447,15 @@ location of DERIVATION." (and=> (find-attribute-by-name "description" meta) attribute-value))) (description - ,(and=> (find-attribute-by-name "longDescription" meta) - attribute-value)) + ;; Likewise, prefer the official description of GNU packages. + ,(or (false-if-exception + (and=> (find (lambda (gnu-package) + (equal? (gnu-package-name gnu-package) + name)) + (official-gnu-packages)) + gnu-package-doc-description)) + (and=> (find-attribute-by-name "longDescription" meta) + attribute-value))) (license ,(and=> (find-attribute-by-name "license" meta) (compose license-variable attribute-value)))) loc)))))) -- cgit v1.2.3