summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-10-09 16:18:23 +0200
committerLudovic Courtès <ludo@gnu.org>2013-10-09 16:18:23 +0200
commit4e45e352663f51d4b669256373819f8bc6fbd489 (patch)
treec389ff86cf7789480aa3a48b47ef4130abf8f916
parenta22dc0c49aed0babe16ef92ae24847b343b7eb02 (diff)
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.
-rw-r--r--guix/snix.scm11
1 files changed, 9 insertions, 2 deletions
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))))))