gnu: emacs-svg-icon: Fix grammar.

[jackhill/guix/guix.git] / gnu / packages / fvwm.scm

diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm
index 63b1052..6509fb3 100644 (file)
--- a/gnu/packages/fvwm.scm
+++ b/gnu/packages/fvwm.scm
@@ -1,7 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
+;;; Copyright © 2017 Nikita <nikita@n0.is>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,15 +36,15 @@
 (define-public fvwm
   (package
     (name "fvwm")
-    (version "2.6.7")
+    (version "2.6.9")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "https://github.com/fvwmorg/fvwm/releases/download/"
-                    version "/" name "-" version ".tar.gz"))
+                    version "/fvwm-" version ".tar.gz"))
               (sha256
                (base32
-                "0wzghjgy65pkn31rgl14fngizw7nbkzbxsfa670xmrndpmd4sr81"))))
+                "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -53,18 +54,11 @@
              (let* ((out (assoc-ref outputs "out"))
                     (xsessions (string-append out "/share/xsessions")))
                (mkdir-p xsessions)
-               (with-output-to-file
-                   (string-append xsessions "/fvwm2.desktop")
-                 (lambda _
-                   (format #t
-                           "[Desktop Entry]~@
-                    Name=FVWM~@
-                    Comment=FVWM~@
-                    Exec=~a/bin/fvwm~@
-                    TryExec=~@*~a/bin/fvwm~@
-                    Icon=~@
-                    Type=Application~%"
-                           out))))
+               (make-desktop-entry-file
+                 (string-append xsessions "/fvwm2.desktop")
+                 #:name "FVWM"
+                 #:exec (string-append out "/bin/" ,name)
+                 #:comment '("FVWM")))
              #t)))))
     (native-inputs
      `(("perl" ,perl)
@@ -85,5 +79,5 @@
     (description
      "FVWM is an extremely powerful ICCCM-compliant multiple virtual desktop
 window manager for the X Window system.")
-    (home-page "http://www.fvwm.org/")
+    (home-page "https://www.fvwm.org/")
     (license gpl2+)))