diff options
| -rw-r--r-- | gnu/packages/emulators.scm | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f669213f4f3..a59b0f2828c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm | |||
| @@ -117,8 +117,8 @@ | |||
| 117 | 117 | ||
| 118 | ;; Building from recent Git because the official 5.0 release no longer builds. | 118 | ;; Building from recent Git because the official 5.0 release no longer builds. |
| 119 | (define-public dolphin-emu | 119 | (define-public dolphin-emu |
| 120 | (let ((commit "47fd8c6eff4cdea7660d0fa78040f98d1d4fa136") | 120 | (let ((commit "806c1ee8f0ed824008185212bfab2658d400b576") |
| 121 | (revision "1")) | 121 | (revision "2")) |
| 122 | (package | 122 | (package |
| 123 | (name "dolphin-emu") | 123 | (name "dolphin-emu") |
| 124 | (version (git-version "5.0" revision commit)) | 124 | (version (git-version "5.0" revision commit)) |
| @@ -136,21 +136,18 @@ | |||
| 136 | (for-each (lambda (dir) | 136 | (for-each (lambda (dir) |
| 137 | (delete-file-recursively | 137 | (delete-file-recursively |
| 138 | (string-append "Externals/" dir))) | 138 | (string-append "Externals/" dir))) |
| 139 | '("LZO" "OpenAL" "Qt" "SFML" "SOIL" "curl" "ffmpeg" | 139 | '("LZO" "OpenAL" "Qt" "SFML" "curl" "ffmpeg" |
| 140 | "gettext" "hidapi" "libpng" "libusb" "mbedtls" | 140 | "gettext" "hidapi" "libpng" "libusb" "mbedtls" |
| 141 | "miniupnpc" "wxWidgets3" "zlib")) | 141 | "miniupnpc" "zlib")) |
| 142 | ;; Clean up source. | 142 | ;; Clean up source. |
| 143 | (for-each delete-file (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) | 143 | (for-each delete-file (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) |
| 144 | #t)) | 144 | #t)) |
| 145 | (sha256 | 145 | (sha256 |
| 146 | (base32 | 146 | (base32 |
| 147 | "1gp2sshnr0dswdawxd5ix96nksp435b52bqvpjx8pmn523k29zsw")))) | 147 | "1sdc7rh6z7gjx4kxg18jrv7srfpx1vgf936zg5y43radnlscrh1j")))) |
| 148 | (build-system cmake-build-system) | 148 | (build-system cmake-build-system) |
| 149 | (arguments | 149 | (arguments |
| 150 | '(#:tests? #f | 150 | '(#:tests? #f |
| 151 | ;; The FindGTK2 cmake script only checks hardcoded directories for | ||
| 152 | ;; glib/gtk headers. | ||
| 153 | |||
| 154 | #:phases | 151 | #:phases |
| 155 | (modify-phases %standard-phases | 152 | (modify-phases %standard-phases |
| 156 | (add-before 'configure 'fixgcc7 | 153 | (add-before 'configure 'fixgcc7 |
| @@ -177,14 +174,11 @@ | |||
| 177 | (("libvulkan.so") libvulkan)) | 174 | (("libvulkan.so") libvulkan)) |
| 178 | #t)))) | 175 | #t)))) |
| 179 | 176 | ||
| 177 | ;; The FindGTK2 cmake script only checks hardcoded directories for | ||
| 178 | ;; glib/gtk headers. | ||
| 179 | |||
| 180 | #:configure-flags | 180 | #:configure-flags |
| 181 | (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" | 181 | (list (string-append "-DX11_INCLUDE_DIR=" |
| 182 | (assoc-ref %build-inputs "gtk+") | ||
| 183 | "/lib/gtk-2.0/include") | ||
| 184 | (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" | ||
| 185 | (assoc-ref %build-inputs "glib") | ||
| 186 | "/lib/glib-2.0/include") | ||
| 187 | (string-append "-DX11_INCLUDE_DIR=" | ||
| 188 | (assoc-ref %build-inputs "libx11") | 182 | (assoc-ref %build-inputs "libx11") |
| 189 | "/include") | 183 | "/include") |
| 190 | (string-append "-DX11_LIBRARIES=" | 184 | (string-append "-DX11_LIBRARIES=" |
| @@ -220,6 +214,7 @@ | |||
| 220 | ("mesa" ,mesa) | 214 | ("mesa" ,mesa) |
| 221 | ("miniupnpc" ,miniupnpc) | 215 | ("miniupnpc" ,miniupnpc) |
| 222 | ("openal" ,openal) | 216 | ("openal" ,openal) |
| 217 | ("pugixml" ,pugixml) | ||
| 223 | ("pulseaudio" ,pulseaudio) | 218 | ("pulseaudio" ,pulseaudio) |
| 224 | ("qtbase" ,qtbase) | 219 | ("qtbase" ,qtbase) |
| 225 | ("sdl2" ,sdl2) | 220 | ("sdl2" ,sdl2) |
| @@ -227,7 +222,6 @@ | |||
| 227 | ("soil" ,soil) | 222 | ("soil" ,soil) |
| 228 | ("soundtouch" ,soundtouch) | 223 | ("soundtouch" ,soundtouch) |
| 229 | ("vulkan-loader" ,vulkan-loader) | 224 | ("vulkan-loader" ,vulkan-loader) |
| 230 | ("wxwidgets" ,wxwidgets-gtk2-3.1) | ||
| 231 | ("zlib" ,zlib))) | 225 | ("zlib" ,zlib))) |
| 232 | (home-page "https://dolphin-emu.org/") | 226 | (home-page "https://dolphin-emu.org/") |
| 233 | (synopsis "Nintendo Wii and GameCube emulator") | 227 | (synopsis "Nintendo Wii and GameCube emulator") |
