about summary refs log tree commit diff
path: root/pkgs/misc/emulators/dolphin-emu
diff options
context:
space:
mode:
authorLuke Adams <luke.adams@belljar.io>2017-07-20 19:15:04 -0500
committerCray Elliott <MP2E@archlinux.us>2017-12-23 22:31:15 -0800
commit1852176d2e93e6d9617de63b0648c544b1217ec7 (patch)
tree59ca952f084abc35e068b07b2b78aef2f3fa9fa1 /pkgs/misc/emulators/dolphin-emu
parent1e5973850e4589a65863e242431c029c6fc69bb4 (diff)
downloadnixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.gz
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.bz2
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.lz
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.xz
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.zst
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.zip
dolphinEmuMaster: move inputs to nativeBuildInputs
- add Darwin inputs
- Add curl to prevent in-tree build
- add libpng hidapi wxgtk for dolphin to use
Diffstat (limited to 'pkgs/misc/emulators/dolphin-emu')
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix24
1 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index b7a37e25b700..7cbe87a7cfc1 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,7 +1,14 @@
-{ stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
-, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
-, libpulseaudio ? null }:
+, openal, libXdmcp, portaudio, libusb, libevdev
+, libpulseaudio ? null
+, curl
+# - Inputs used for Darwin
+, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL
+, wxGTK
+, libpng
+, hidapi
+}:
 
 stdenv.mkDerivation rec {
   name = "dolphin-emu-20170902";
@@ -17,14 +24,17 @@ stdenv.mkDerivation rec {
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
     "-DENABLE_LTO=True"
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre
                   gettext libpthreadstubs libXrandr libXext libSM readline openal
-                  libevdev libXdmcp portaudio libusb libpulseaudio ];
+                  libXdmcp portaudio libusb libpulseaudio libpng hidapi
+                ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
+                  ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ];
 
   meta = {
     homepage = http://dolphin-emu.org/;