summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@gmail.com>2017-09-30 11:59:35 +0000
committerYegor Timoshenko <yegortimoshenko@gmail.com>2017-09-30 23:50:16 +0000
commit055759d27a34a0b5654c7cc1380f60023eb2f91e (patch)
tree759ca141040c4b64c825a3e86fc03a7945a884bf /pkgs/misc/emulators
parent37464fd42a2eb87ac106e38f18a921a481dd9a41 (diff)
downloadnixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.tar
nixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.tar.gz
nixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.tar.bz2
nixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.tar.lz
nixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.tar.xz
nixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.tar.zst
nixlib-055759d27a34a0b5654c7cc1380f60023eb2f91e.zip
yabause: Qt4 -> Qt5, disable emu-compatibility.com in About menu
emu-compatibility.com is now defunct and thus should not be in About menu.

Other minor changes:
* linkage-rwx-linux-elf.diff -> linkage-rwx-linux-elf.patch
* Mark some inputs as optional
* Do not build with Doxygen by default: it does not produce any outputs
* Do not build with OpenAL by default: SDL2 handles sound when present
* Do not build with FreeGLUT by default: deprecated at upstream
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/yabause/default.nix36
-rw-r--r--pkgs/misc/emulators/yabause/emu-compatibility.com.patch10
-rw-r--r--pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch (renamed from pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff)0
3 files changed, 27 insertions, 19 deletions
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index 23d91040b125..2fc60b543e67 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,35 +1,33 @@
-{ stdenv, fetchurl, config
-, cmake, pkgconfig
-, doxygen
-, qt
-, libXmu, mesa, openal, SDL2, freeglut
-}:
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa
+, freeglut ? null, openal ? null, SDL2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "yabause-${meta.version}";
+  name = "yabause-${version}";
+  # 0.9.15 only works with OpenGL 3.2 or later:
+  # https://github.com/Yabause/yabause/issues/349
+  version = "0.9.14";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
     sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
   };
 
-  patches = [ ./linkage-rwx-linux-elf.diff ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ qtbase mesa freeglut openal SDL2 ];
 
-  buildInputs =
-  [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ];
+  patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
 
-  cmakeConfigureFlags = [    
-    "-DYAB_PORTS='qt'"
-    "-DYAB_OPTIMIZED_DMA='ON'"
-    "-DYAB_NETWORK='ON'" ] ;
+  cmakeFlags = [
+    "-DYAB_NETWORK=ON"
+    "-DYAB_OPTIMIZED_DMA=ON"
+    "-DYAB_PORTS=qt"
+  ] ;
 
   meta = with stdenv.lib; {
-    version = "0.9.14";
     description = "An open-source Sega Saturn emulator";
-    homepage = http://yabause.org/;
+    homepage = https://yabause.org/;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = with maintaines; [ AndersonTorres ];
     platforms = platforms.linux;
   };
 }
-# TODO: Qt5
diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
new file mode 100644
index 000000000000..5f13d2ee1837
--- /dev/null
+++ b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
@@ -0,0 +1,10 @@
+--- a/src/qt/ui/UIYabause.ui	2017-09-28 13:23:04.636014753 +0000
++++ b/src/qt/ui/UIYabause.ui	2017-09-28 13:23:21.945763537 +0000
+@@ -230,7 +230,6 @@
+     <property name="title">
+      <string>&amp;Help</string>
+     </property>
+-    <addaction name="aHelpEmuCompatibility"/>
+     <addaction name="aHelpAbout"/>
+    </widget>
+    <widget class="QMenu" name="mTools">
diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
index bb0491b373f8..bb0491b373f8 100644
--- a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff
+++ b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch