01/01: gnu: ratpoison: Clean definition.

[Mathieu Lirzin]

mthl pushed a commit to branch master
in repository guix.

commit 45fed6d32c288dbf5400ace42179256036c4c233
Author: Mathieu Lirzin <address@hidden>
Date:   Thu Aug 6 18:02:59 2015 +0200

    gnu: ratpoison: Clean definition.
    
    * gnu/packages/ratpoison.scm (ratpoison)[arguments]: Use modify-phases.
      [inputs]: Sort alphabetically.  Move ratpoison.desktop to ...
      [native-inputs]: ... here.
---
 gnu/packages/ratpoison.scm |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index a73e6cf..dc6db72 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -44,8 +44,8 @@
   (package
     (name "ratpoison")
     (version "1.4.8")
-    (source (origin
-             (method url-fetch)
+    (source
+     (origin (method url-fetch)
              (uri (string-append "mirror://savannah/ratpoison/ratpoison-"
                                  version ".tar.xz"))
              (sha256
@@ -55,32 +55,32 @@
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-       (alist-cons-after
-        'install 'install-xsession
-        (lambda _
-          (let* ((file      (assoc-ref %build-inputs "ratpoison.desktop"))
-                 (xsessions (string-append %output "/share/xsessions"))
-                 (target    (string-append xsessions "/ratpoison.desktop")))
-            (mkdir-p xsessions)
-            (copy-file file target)))
-        %standard-phases)))
+       (modify-phases %standard-phases
+         (add-after 'install 'install-xsession
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let ((rpd "ratpoison.desktop")
+                            (dst (string-append (assoc-ref outputs "out")
+                                                "/share/xsessions/")))
+                        (mkdir-p dst)
+                        (copy-file (assoc-ref inputs rpd)
+                                   (string-append dst rpd))))))))
     (inputs
-     `(("libXi" ,libxi)
-       ("readline" ,readline)
-       ("xextproto" ,xextproto)
-       ("libXtst" ,libxtst)
-       ("freetype" ,freetype)
+     `(("inputproto" ,inputproto)
        ("fontconfig" ,fontconfig)
-       ("libxinerama" ,libxinerama)
+       ("freetype" ,freetype)
        ("libXft" ,libxft)
+       ("libXi" ,libxi)
+       ("libxinerama" ,libxinerama)
        ("libXpm" ,libxpm)
        ("libXt" ,libxt)
-       ("inputproto" ,inputproto)
+       ("libXtst" ,libxtst)
        ("libX11" ,libx11)
-       ("ratpoison.desktop" ,ratpoison.desktop)))
+       ("readline" ,readline)
+       ("xextproto" ,xextproto)))
     (native-inputs
-      `(("perl" ,perl)
-        ("pkg-config" ,pkg-config)))
+     `(("perl",perl)
+       ("pkg-config" ,pkg-config)
+       ("ratpoison.desktop" ,ratpoison.desktop)))
     (home-page "http://www.nongnu.org/ratpoison/";)
     (synopsis "Simple mouse-free tiling window manager")
     (description