summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2014-10-26 15:27:56 +0300
committerAlex Kost <alezost@gmail.com>2014-10-26 22:22:43 +0300
commit8835aed4ad541c9ec285634adaf71f8a03525a95 (patch)
tree3e414e709ab1a45e12e716c909458b3c0c525afa
parent35b9e4232c1b59568c9a76630251c1ea6a330ac4 (diff)
downloadguix-8835aed4ad541c9ec285634adaf71f8a03525a95.tar.gz
licenses: Add 'imlib2'.
* guix/licenses.scm (imlib2): New variable.
* gnu/packages/image.scm (imlib2): Use it.
-rw-r--r--gnu/packages/image.scm4
-rw-r--r--guix/licenses.scm6
2 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 71a2e8c984..38e3ddd73f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -313,9 +313,7 @@ without sacrificing speed.
 
 This is a complete rewrite over the Imlib 1.x series.  The architecture is
 more modular, simple, and flexible.")
-    ;; This license adds several sentences to the original X11 license.
-    (license (license:x11-style "file://COPYING"
-                                "See 'COPYING' in the distribution."))))
+    (license license:imlib2)))
 
 (define-public giblib
   (package
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 65ef06c8e8..8b7ea539fa 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -37,6 +37,7 @@
             isc
             ijg
             ibmpl1.0
+            imlib2
             lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
             mpl2.0
             openldap2.8 openssl
@@ -195,6 +196,11 @@ which may be a file:// URI pointing the package's tree."
            "http://directory.fsf.org/wiki/License:IBMPLv1.0"
            "https://www.gnu.org/licenses/license-list#IBMPL"))
 
+(define imlib2
+  (license "Imlib2"
+           "http://directory.fsf.org/wiki/License:Imlib2"
+           "https://www.gnu.org/licenses/license-list#imlib"))
+
 (define lgpl2.0
   (license "LGPL 2.0"
            "https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html"