gnu: ultrastar-deluxe: Improve package style.
* gnu/packages/games.scm (ultrastar-deluxe): Do not exceed column 80. [source]<snippet>: Use G-Expressions. [#:phases]: Fix indentation. <fix-configure>: Add ‘where’ helper and use it to shrink horizontal space.
This commit is contained in:
		
							parent
							
								
									4cecbc5dd2
								
							
						
					
					
						commit
						e58450be4a
					
				
					 1 changed files with 42 additions and 36 deletions
				
			
		| 
						 | 
				
			
			@ -11163,7 +11163,7 @@ and unsafe rides.  Which path will you take?")
 | 
			
		|||
    (license license:gpl2)))
 | 
			
		||||
 | 
			
		||||
(define-public ultrastar-deluxe
 | 
			
		||||
  ;; The last release is quite old and does not support recent versions of ffmpeg.
 | 
			
		||||
  ;; The last release is quite old and does not support recent ffmpeg versions.
 | 
			
		||||
  (let ((commit "43484b0a10ce6aae339e19d81ae2f7b37caf6baa")
 | 
			
		||||
        (revision "1"))
 | 
			
		||||
    (package
 | 
			
		||||
| 
						 | 
				
			
			@ -11181,11 +11181,12 @@ and unsafe rides.  Which path will you take?")
 | 
			
		|||
                (patches (search-patches "ultrastar-deluxe-no-freesans.patch"))
 | 
			
		||||
                (modules '((guix build utils)))
 | 
			
		||||
                (snippet
 | 
			
		||||
                 `(begin
 | 
			
		||||
                 #~(begin
 | 
			
		||||
                     ;; Remove Windows binaries.
 | 
			
		||||
                     (for-each delete-file (find-files "game" "\\.dll$"))
 | 
			
		||||
                     ;; Remove font blobs.
 | 
			
		||||
                    (let ((font-directories (list "DejaVu" "FreeSans" "NotoSans"
 | 
			
		||||
                     (let ((font-directories
 | 
			
		||||
                            (list "DejaVu" "FreeSans" "NotoSans"
 | 
			
		||||
                                  "wqy-microhei")))
 | 
			
		||||
                       (for-each
 | 
			
		||||
                        (lambda (d) (delete-file-recursively
 | 
			
		||||
| 
						 | 
				
			
			@ -11199,22 +11200,27 @@ and unsafe rides.  Which path will you take?")
 | 
			
		|||
         #~(modify-phases %standard-phases
 | 
			
		||||
             (add-after 'unpack 'fix-configure
 | 
			
		||||
               (lambda* (#:key inputs configure-flags outputs #:allow-other-keys)
 | 
			
		||||
               ;; The configure script looks for lua$version, but we provide lua-$version.
 | 
			
		||||
                 (define (where inputs file)
 | 
			
		||||
                   (dirname (search-input-file inputs file)))
 | 
			
		||||
                 ;; The configure script looks for lua$version, but we
 | 
			
		||||
                 ;; provide lua-$version.
 | 
			
		||||
                 (substitute* "configure.ac"
 | 
			
		||||
                   (("lua\\$i") "lua-$i"))
 | 
			
		||||
               ;; fpc does not pass -lfoo to the linker, but uses its own linker script,
 | 
			
		||||
               ;; which references libs. Pass the libraries listed in that linker script,
 | 
			
		||||
               ;; so our custom linker adds a correct rpath.
 | 
			
		||||
                 ;; fpc does not pass -lfoo to the linker, but uses its own
 | 
			
		||||
                 ;; linker script, which references libs.  Pass the libraries
 | 
			
		||||
                 ;; listed in that linker script, so our custom linker adds
 | 
			
		||||
                 ;; a correct rpath.
 | 
			
		||||
                 (substitute* "src/Makefile.in"
 | 
			
		||||
                   (("linkflags\\s+:= ")
 | 
			
		||||
                  (string-append "linkflags := -lpthread -lsqlite3 -lSDL2"
 | 
			
		||||
                    (string-append
 | 
			
		||||
                     "linkflags := -lpthread -lsqlite3 -lSDL2"
 | 
			
		||||
                     " -lSDL2_image -ldl "
 | 
			
		||||
                     " -lz -lfreetype -lportaudio -lavcodec"
 | 
			
		||||
                     " -lavformat -lavutil -lswresample"
 | 
			
		||||
                     " -lswscale -llua -ldl -lX11 -lportmidi"
 | 
			
		||||
                                 " -L" (dirname (search-input-file inputs "lib/libz.so"))
 | 
			
		||||
                                 " -L" (dirname (search-input-file inputs "lib/libX11.so"))
 | 
			
		||||
                                 " -L" (dirname (search-input-file inputs "lib/libportmidi.so")))))))
 | 
			
		||||
                     " -L" (where inputs "lib/libz.so")
 | 
			
		||||
                     " -L" (where inputs "lib/libX11.so")
 | 
			
		||||
                     " -L" (where inputs "lib/libportmidi.so"))))))
 | 
			
		||||
             (add-after 'install 'font-paths
 | 
			
		||||
               (lambda* (#:key outputs #:allow-other-keys)
 | 
			
		||||
                 (substitute* (string-append
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue