nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: dolphin-emu: Update to commit 806c1ee. 

* gnu/packages/emulators.scm (dolphin-emu): Update to commit 806c1ee.
[source]: Don't delete removed externals.
[arguments]: Remove unused variables.
[inputs]: Add 'pugixml. Remove 'wxwidgets-gtk2-3.1.
This commit is contained in:
Rutger Helling 2018-07-03 09:09:17 +02:00
parent a6a2ef27a3
commit fab8d41c64
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/emulators.scm
View File

@ -117,8 +117,8 @@
;; Building from recent Git because the official 5.0 release no longer builds. ;; Building from recent Git because the official 5.0 release no longer builds.
(define-public dolphin-emu (define-public dolphin-emu
(let ((commit "47fd8c6eff4cdea7660d0fa78040f98d1d4fa136") (let ((commit "806c1ee8f0ed824008185212bfab2658d400b576")
(revision "1")) (revision "2"))
(package (package
(name "dolphin-emu") (name "dolphin-emu")
(version (git-version "5.0" revision commit)) (version (git-version "5.0" revision commit))
@ -136,21 +136,18 @@
(for-each (lambda (dir) (for-each (lambda (dir)
(delete-file-recursively (delete-file-recursively
(string-append "Externals/" dir))) (string-append "Externals/" dir)))
'("LZO" "OpenAL" "Qt" "SFML" "SOIL" "curl" "ffmpeg" '("LZO" "OpenAL" "Qt" "SFML" "curl" "ffmpeg"
"gettext" "hidapi" "libpng" "libusb" "mbedtls" "gettext" "hidapi" "libpng" "libusb" "mbedtls"
"miniupnpc" "wxWidgets3" "zlib")) "miniupnpc" "zlib"))
;; Clean up source. ;; Clean up source.
(for-each delete-file (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) (for-each delete-file (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$"))
#t)) #t))
(sha256 (sha256
(base32 (base32
"1gp2sshnr0dswdawxd5ix96nksp435b52bqvpjx8pmn523k29zsw")))) "1sdc7rh6z7gjx4kxg18jrv7srfpx1vgf936zg5y43radnlscrh1j"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
;; The FindGTK2 cmake script only checks hardcoded directories for
;; glib/gtk headers.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fixgcc7 (add-before 'configure 'fixgcc7
@ -177,14 +174,11 @@
(("libvulkan.so") libvulkan)) (("libvulkan.so") libvulkan))
#t)))) #t))))
;; The FindGTK2 cmake script only checks hardcoded directories for
;; glib/gtk headers.
#:configure-flags #:configure-flags
(list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" (list (string-append "-DX11_INCLUDE_DIR="
(assoc-ref %build-inputs "gtk+")
"/lib/gtk-2.0/include")
(string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR="
(assoc-ref %build-inputs "glib")
"/lib/glib-2.0/include")
(string-append "-DX11_INCLUDE_DIR="
(assoc-ref %build-inputs "libx11") (assoc-ref %build-inputs "libx11")
"/include") "/include")
(string-append "-DX11_LIBRARIES=" (string-append "-DX11_LIBRARIES="
@ -220,6 +214,7 @@
("mesa" ,mesa) ("mesa" ,mesa)
("miniupnpc" ,miniupnpc) ("miniupnpc" ,miniupnpc)
("openal" ,openal) ("openal" ,openal)
("pugixml" ,pugixml)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
@ -227,7 +222,6 @@
("soil" ,soil) ("soil" ,soil)
("soundtouch" ,soundtouch) ("soundtouch" ,soundtouch)
("vulkan-loader" ,vulkan-loader) ("vulkan-loader" ,vulkan-loader)
("wxwidgets" ,wxwidgets-gtk2-3.1)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://dolphin-emu.org/") (home-page "https://dolphin-emu.org/")
(synopsis "Nintendo Wii and GameCube emulator") (synopsis "Nintendo Wii and GameCube emulator")