gnu: godot: Remove unused bundled libraries from the source.
While at it, also use system libvpx. * gnu/packages/game-development.scm (godot)[source](snippet): New field. [arguments]: Add "builtin_libvpx=no" to #:scons-flags. [inputs]: Add LIBVPX.
This commit is contained in:
		
							parent
							
								
									8311a84416
								
							
						
					
					
						commit
						5b8d2ace93
					
				
					 1 changed files with 22 additions and 1 deletions
				
			
		| 
						 | 
					@ -13,6 +13,7 @@
 | 
				
			||||||
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
 | 
					;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
 | 
				
			||||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 | 
					;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 | 
				
			||||||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 | 
					;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 | 
				
			||||||
 | 
					;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -1073,7 +1074,25 @@ games.")
 | 
				
			||||||
              (file-name (string-append name "-" version ".tar.gz"))
 | 
					              (file-name (string-append name "-" version ".tar.gz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))))
 | 
					                "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))
 | 
				
			||||||
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
 | 
					              (snippet
 | 
				
			||||||
 | 
					               '(begin
 | 
				
			||||||
 | 
					                  ;; Drop libraries that we take from Guix.  Note that some
 | 
				
			||||||
 | 
					                  ;; of these may be modified; see "thirdparty/README.md".
 | 
				
			||||||
 | 
					                  (with-directory-excursion "thirdparty"
 | 
				
			||||||
 | 
					                    (for-each delete-file-recursively
 | 
				
			||||||
 | 
					                              '("freetype"
 | 
				
			||||||
 | 
					                                "libogg"
 | 
				
			||||||
 | 
					                                "libpng"
 | 
				
			||||||
 | 
					                                "libtheora"
 | 
				
			||||||
 | 
					                                "libvorbis"
 | 
				
			||||||
 | 
					                                "libvpx"
 | 
				
			||||||
 | 
					                                "libwebp"
 | 
				
			||||||
 | 
					                                "openssl"
 | 
				
			||||||
 | 
					                                "opus"
 | 
				
			||||||
 | 
					                                "zlib"))
 | 
				
			||||||
 | 
					                    #t)))))
 | 
				
			||||||
    (build-system scons-build-system)
 | 
					    (build-system scons-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:scons ,scons-python2
 | 
					     `(#:scons ,scons-python2
 | 
				
			||||||
| 
						 | 
					@ -1091,6 +1110,7 @@ games.")
 | 
				
			||||||
                           "builtin_libpng=no"
 | 
					                           "builtin_libpng=no"
 | 
				
			||||||
                           "builtin_libtheora=no"
 | 
					                           "builtin_libtheora=no"
 | 
				
			||||||
                           "builtin_libvorbis=no"
 | 
					                           "builtin_libvorbis=no"
 | 
				
			||||||
 | 
					                           "builtin_libvpx=no"
 | 
				
			||||||
                           "builtin_libwebp=no"
 | 
					                           "builtin_libwebp=no"
 | 
				
			||||||
                           "builtin_openssl=no"
 | 
					                           "builtin_openssl=no"
 | 
				
			||||||
                           "builtin_opus=no"
 | 
					                           "builtin_opus=no"
 | 
				
			||||||
| 
						 | 
					@ -1146,6 +1166,7 @@ games.")
 | 
				
			||||||
              ("glu" ,glu)
 | 
					              ("glu" ,glu)
 | 
				
			||||||
              ("libtheora" ,libtheora)
 | 
					              ("libtheora" ,libtheora)
 | 
				
			||||||
              ("libvorbis" ,libvorbis)
 | 
					              ("libvorbis" ,libvorbis)
 | 
				
			||||||
 | 
					              ("libvpx" ,libvpx)
 | 
				
			||||||
              ("libwebp" ,libwebp)
 | 
					              ("libwebp" ,libwebp)
 | 
				
			||||||
              ("libx11" ,libx11)
 | 
					              ("libx11" ,libx11)
 | 
				
			||||||
              ("libxcursor" ,libxcursor)
 | 
					              ("libxcursor" ,libxcursor)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue