diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-11 17:28:07 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-11 17:28:07 -0400 |
commit | aabfda6d5d3865e57041376a95d8b78140f8d54b (patch) | |
tree | 178570763c876f1755310d191b39b2aa1fbef340 /pkgs/misc/emulators/dolphin-emu/master.nix | |
parent | 55ff6caf5e77aa46a91b496bacd275ef3ddc662a (diff) | |
parent | 7079e744d4666db3af186899fe2fc0ef3cbeb842 (diff) | |
download | nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.gz nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.bz2 nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.lz nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.xz nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.zst nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.zip |
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging
Diffstat (limited to 'pkgs/misc/emulators/dolphin-emu/master.nix')
-rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index c18a63f720dd..e2bac5d3884c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline , openal, libXdmcp, portaudio, libusb, libevdev , libpulseaudio ? null @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre + buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal libXdmcp portaudio libusb libpulseaudio libpng hidapi ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] |