guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/17: gnu: golly: More tweaks.


From: Mark H. Weaver
Subject: 07/17: gnu: golly: More tweaks.
Date: Mon, 23 Apr 2018 03:07:28 -0400 (EDT)

mhw pushed a commit to branch reproduce-bug-29774
in repository guix.

commit 956f5e25d04ce6ef76d8311fbcc44831e375c008
Author: Mark H Weaver <address@hidden>
Date:   Sun Jan 28 23:19:56 2018 -0500

    gnu: golly: More tweaks.
    
    * gnu/packages/games.scm (golly)[source]: In snippet, remove more extraneous
    files and fix permissions.
    [arguments]: In install phase, install the contents of gui-wx/bitmaps.
    [home-page]: Use HTTPS URL.
    [license]: Add psfl to the list of licenses.
---
 gnu/packages/games.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index aa5da46..5c2e85a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -385,6 +385,13 @@ effects and music to make a completely free game.")
                '(begin
                   ;; Remove bundled lua.
                   (delete-file-recursively "lua")
+                  ;; Remove backup files.
+                  (for-each delete-file (find-files "." "~$"))
+                  ;; Remove vestigial script.
+                  (delete-file "Help/Lexicon/modify.pl")
+                  ;; Fix permissions.
+                  (for-each (lambda (f) (chmod f #o644))
+                            (find-files "."))
                   #t))))
     (build-system gnu-build-system)
     (arguments
@@ -428,8 +435,9 @@ effects and music to make a completely free game.")
                (for-each (lambda (folder)
                            (copy-recursively
                             folder
-                            (string-append share "/" folder)))
-                         '("Help" "Patterns" "Rules" "Scripts")))
+                            (string-append share "/" (basename folder))))
+                         '("gui-wx/bitmaps"
+                           "Help" "Patterns" "Rules" "Scripts")))
              #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -440,7 +448,7 @@ effects and music to make a completely free game.")
        ("python" ,python-2)
        ("wxwidgets" ,wxwidgets-gtk2)
        ("zlib" ,zlib)))
-    (home-page "http://golly.sourceforge.net/";)
+    (home-page "https://golly.sourceforge.net/";)
     (synopsis "Software for exploring cellular automata")
     (description
      "Golly simulates Conway's Game of Life and many other types of cellular
@@ -460,7 +468,8 @@ automata.  The following features are available:
 @item Configurable keyboard shortcuts.
 @item Auto fit option to keep patterns within the view.
 @end enumerate")
-    (license license:gpl2+)))
+    (license (list license:gpl2+        ; main program
+                   license:psfl))))     ; python binding
 
 (define-public meandmyshadow
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]