gnu: cataclysm-dda: Improve package style.
* gnu/packages/games.scm (cataclysm-dda)[arguments]: Use G-expressions. [native-inputs]: Remove labels. Re-order alphabetically.
This commit is contained in:
		
							parent
							
								
									f7682c2475
								
							
						
					
					
						commit
						ad64874753
					
				
					 1 changed files with 31 additions and 34 deletions
				
			
		| 
						 | 
				
			
			@ -954,12 +954,13 @@ high a score as possible.")
 | 
			
		|||
       (file-name (git-file-name name version))))
 | 
			
		||||
    (build-system gnu-build-system)
 | 
			
		||||
    (arguments
 | 
			
		||||
     '(#:make-flags
 | 
			
		||||
       (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
 | 
			
		||||
     (list
 | 
			
		||||
      #:make-flags
 | 
			
		||||
      #~(list (string-append "PREFIX=" #$output)
 | 
			
		||||
              "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
 | 
			
		||||
              "LOCALIZE=1" "LANGUAGES=all")
 | 
			
		||||
      #:phases
 | 
			
		||||
       (modify-phases %standard-phases
 | 
			
		||||
      #~(modify-phases %standard-phases
 | 
			
		||||
          (delete 'configure)
 | 
			
		||||
          ;; Apparently we can't do make on both tiles and a console version at
 | 
			
		||||
          ;; the same time anymore, so we have to either "make clean" between
 | 
			
		||||
| 
						 | 
				
			
			@ -973,14 +974,12 @@ high a score as possible.")
 | 
			
		|||
            (lambda* (#:key make-flags outputs #:allow-other-keys)
 | 
			
		||||
              ;; Change prefix directory and enable tile graphics and sound.
 | 
			
		||||
              (apply invoke "make" "TILES=1" "SOUND=1"
 | 
			
		||||
                    (string-append "PREFIX="
 | 
			
		||||
                                   (assoc-ref outputs "tiles"))
 | 
			
		||||
                     (string-append "PREFIX=" #$output:tiles)
 | 
			
		||||
                     (cdr make-flags))))
 | 
			
		||||
          (add-after 'build-tiles 'install-tiles
 | 
			
		||||
            (lambda* (#:key make-flags outputs #:allow-other-keys)
 | 
			
		||||
              (apply invoke "make" "install" "TILES=1" "SOUND=1"
 | 
			
		||||
                    (string-append "PREFIX="
 | 
			
		||||
                                   (assoc-ref outputs "tiles"))
 | 
			
		||||
                     (string-append "PREFIX=" #$output:tiles)
 | 
			
		||||
                     (cdr make-flags)))))
 | 
			
		||||
      ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native
 | 
			
		||||
      ;;       input in order to support tests.
 | 
			
		||||
| 
						 | 
				
			
			@ -988,9 +987,7 @@ high a score as possible.")
 | 
			
		|||
    (outputs '("out"
 | 
			
		||||
               "tiles"))                ;for tile graphics and sound support
 | 
			
		||||
    (native-inputs
 | 
			
		||||
     `(("gettext" ,gettext-minimal)
 | 
			
		||||
       ("pkg-config" ,pkg-config)
 | 
			
		||||
       ("astyle" ,astyle)))
 | 
			
		||||
     (list astyle gettext-minimal pkg-config))
 | 
			
		||||
    (inputs
 | 
			
		||||
     (list freetype
 | 
			
		||||
           libogg
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue