JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dolphinEmuMaster: move inputs to nativeBuildInputs

Browse Source 
- add Darwin inputs
- Add curl to prevent in-tree build
- add libpng hidapi wxgtk for dolphin to use
This commit is contained in:
Luke Adams 2017-07-20 19:15:04 -05:00 committed by Cray Elliott
parent 1e5973850e
commit 1852176d2e
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -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 , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , openal, libXdmcp, portaudio, libusb, libevdev
, libpulseaudio ? null }: , libpulseaudio ? null
, curl
# - Inputs used for Darwin
, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL
, wxGTK
, libpng
, hidapi
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dolphin-emu-20170902"; name = "dolphin-emu-20170902";
@ -17,14 +24,17 @@ stdenv.mkDerivation rec {
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
"-DENABLE_LTO=True" "-DENABLE_LTO=True"
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre
buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre
gettext libpthreadstubs libXrandr libXext libSM readline openal 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 = { meta = {
homepage = http://dolphin-emu.org/; homepage = http://dolphin-emu.org/;

7
pkgs/top-level/all-packages.nix
View File

@ -1839,8 +1839,11 @@ with pkgs;
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { }; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
inherit (darwin) cf-private;
wxGTK = wxGTK31;
};
doomseeker = callPackage ../applications/misc/doomseeker { }; doomseeker = callPackage ../applications/misc/doomseeker { };
slade = callPackage ../applications/misc/slade { slade = callPackage ../applications/misc/slade {