Merge pull request #29899 from yegortimoshenko/yabause/0.9.15

yabause: Qt4 -> Qt5, disable emu-compatibility.com in About menu

authored by Jörg Thalheim and committed by GitHub 3c8d4854 a7159d3c

+30 -21
+17 -19
pkgs/misc/emulators/yabause/default.nix
··· 1 - { stdenv, fetchurl, config 2 - , cmake, pkgconfig 3 - , doxygen 4 - , qt 5 - , libXmu, mesa, openal, SDL2, freeglut 6 - }: 1 + { stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa 2 + , freeglut ? null, openal ? null, SDL2 ? null }: 7 3 8 4 stdenv.mkDerivation rec { 9 - name = "yabause-${meta.version}"; 5 + name = "yabause-${version}"; 6 + # 0.9.15 only works with OpenGL 3.2 or later: 7 + # https://github.com/Yabause/yabause/issues/349 8 + version = "0.9.14"; 10 9 11 10 src = fetchurl { 12 - url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz"; 11 + url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; 13 12 sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; 14 13 }; 15 14 16 - patches = [ ./linkage-rwx-linux-elf.diff ]; 15 + nativeBuildInputs = [ cmake pkgconfig ]; 16 + buildInputs = [ qtbase mesa freeglut openal SDL2 ]; 17 17 18 - buildInputs = 19 - [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ]; 18 + patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; 20 19 21 - cmakeConfigureFlags = [ 22 - "-DYAB_PORTS='qt'" 23 - "-DYAB_OPTIMIZED_DMA='ON'" 24 - "-DYAB_NETWORK='ON'" ] ; 20 + cmakeFlags = [ 21 + "-DYAB_NETWORK=ON" 22 + "-DYAB_OPTIMIZED_DMA=ON" 23 + "-DYAB_PORTS=qt" 24 + ] ; 25 25 26 26 meta = with stdenv.lib; { 27 - version = "0.9.14"; 28 27 description = "An open-source Sega Saturn emulator"; 29 - homepage = http://yabause.org/; 28 + homepage = https://yabause.org/; 30 29 license = licenses.gpl2Plus; 31 - maintainers = [ maintainers.AndersonTorres ]; 30 + maintainers = with maintaines; [ AndersonTorres ]; 32 31 platforms = platforms.linux; 33 32 }; 34 33 } 35 - # TODO: Qt5
+10
pkgs/misc/emulators/yabause/emu-compatibility.com.patch
··· 1 + --- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000 2 + +++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000 3 + @@ -230,7 +230,6 @@ 4 + <property name="title"> 5 + <string>&amp;Help</string> 6 + </property> 7 + - <addaction name="aHelpEmuCompatibility"/> 8 + <addaction name="aHelpAbout"/> 9 + </widget> 10 + <widget class="QMenu" name="mTools">
pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
+3 -2
pkgs/top-level/all-packages.nix
··· 19537 19537 19538 19538 xzoom = callPackage ../tools/X11/xzoom {}; 19539 19539 19540 - yabause = callPackage ../misc/emulators/yabause { 19541 - qt = qt4; 19540 + yabause = libsForQt5.callPackage ../misc/emulators/yabause { 19541 + freeglut = null; 19542 + openal = null; 19542 19543 }; 19543 19544 19544 19545 yadm = callPackage ../applications/version-management/yadm { };