diff options
author | Cray Elliott <MP2E@archlinux.us> | 2015-06-09 03:24:18 -0700 |
---|---|---|
committer | Cray Elliott <MP2E@archlinux.us> | 2015-06-09 03:24:18 -0700 |
commit | e7c2a58250dfbbfae574ac2d2c04e761174b6fda (patch) | |
tree | 12572a9fa3619b2a41522163e258a96fadfb0878 /pkgs/misc | |
parent | 253d30b986931c0c015a6f16cc7b759cd6a3d697 (diff) | |
download | nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.tar nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.tar.gz nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.tar.bz2 nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.tar.lz nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.tar.xz nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.tar.zst nixpkgs-e7c2a58250dfbbfae574ac2d2c04e761174b6fda.zip |
bump dolphinEmuMaster, now needs gcc5 to compile
also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index fd293298b45..f742973c08d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,14 +1,14 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb +, openal, libXdmcp, portaudio, SDL, fetchgit, libusb , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150421"; + name = "dolphin-emu-20150609"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5"; - sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d"; + rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695"; + sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r"; fetchSubmodules = false; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ]; + git libXdmcp portaudio SDL libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; |