Subject: bug#29543: closed (Re: [bug#29543] [PATCH] gnu: windowmaker: Add '.desktop' file.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 06 Dec 2017 21:43:02 +0000

Your bug report

#29543: [PATCH] gnu: windowmaker: Add '.desktop' file.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
29543: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29543
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#29543] [PATCH] gnu: windowmaker: Add '.desktop' file.
From: Kei Kebreau <[email-masked]>
To: [email-masked] (Ludovic Courtès)
Cc: [email-masked]
Date: Wed, 06 Dec 2017 16:41:45 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

[email-masked] (Ludovic Courtès) writes:

> Kei Kebreau <[email-masked]> skribis:
>
>> Like I've attached?
>>
>> From df79e8050b4385d92d6807a4d76cb1c7347d5906 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau <[email-masked]>
>> Date: Sat, 2 Dec 2017 19:43:08 -0500
>> Subject: [PATCH] gnu: windowmaker: Add '.desktop' file.
>>
>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
>> phase. Add (guix build build-system), (guix build utils) and (ice-9 match) to
>
> (Message cut too early?)
>

Yes, I meant to put #:modules, but I forgot that 'git commit' ignores lines
beginning with a hash symbol by default.

> All right!
> Ludo’.

Thanks for the review!

Subject: [PATCH] gnu: windowmaker: Add '.desktop' file.
From: Kei Kebreau <[email-masked]>
To: [email-masked]
Cc: Kei Kebreau <[email-masked]>
Date: Sat, 2 Dec 2017 19:46:53 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
phase.
---
 gnu/packages/gnustep.scm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 195249c43..9a2bfefb4 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -65,6 +65,7 @@ to easily create cross-compiled binaries.")
   (package
     (name "windowmaker")
     (version "0.95.8")
+    (synopsis "NeXTSTEP-like window manager")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -75,7 +76,7 @@ to easily create cross-compiled binaries.")
                 "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'pre-configure
            (lambda* (#:key outputs #:allow-other-keys)
@@ -97,14 +98,29 @@ to easily create cross-compiled binaries.")
                (substitute* "src/defaults.c"
                  (("len = strlen\\(text\\) \\+ 40;")
                   (string-append "len = strlen(text) + 107;"))))))
-         (add-after 'install 'wrap
+         (add-after 'install 'install-xsession
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (xsessions (string-append out "/share/xsessions")))
+               (mkdir-p xsessions)
+               (call-with-output-file
+                   (string-append xsessions "/windowmaker.desktop")
+                 (lambda (port)
+                  (format port "~
+                    [Desktop Entry]~@
+                    Name=Window Maker~@
+                    Comment=~a~@
+                    Exec=~a/bin/wmaker~@
+                    Type=Application~%" ,synopsis %output))))
+             #t))
+         (add-after 'install-xsession 'wrap
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
                      (bin (string-append out "/bin")))
                 ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
                 ;; etc., so make sure everything is in $PATH.
                 (wrap-program (string-append bin "/wmaker.inst")
-                              `("PATH" ":" prefix (,bin)))))))))
+                  `("PATH" ":" prefix (,bin)))))))))
     (inputs
      `(("libxmu" ,libxmu)
        ("libxft" ,libxft)
@@ -117,7 +133,6 @@ to easily create cross-compiled binaries.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://windowmaker.org/")
-    (synopsis "NeXTSTEP-like window manager")
     (description
      "Window Maker is an X11 window manager originally designed to provide
 integration support for the GNUstep Desktop Environment.  In every way
-- 
2.15.0