diff options
Diffstat (limited to 'pkgs/misc/emulators/dolphin-emu/master.nix')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index fe16598fa9c0..e96b2e07890e 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 -, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo -, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline -, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls -, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext +, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib +, miniupnpc, enet, mbedtls, soundtouch, sfml +, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin , CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: @@ -20,27 +21,27 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-10751"; + version = "5.0-10879"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f"; - sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3"; + rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b"; + sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml - qt5.qtbase - ] ++ stdenv.lib.optionals stdenv.isLinux [ + qtbase + ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreBluetooth OpenGL ForceFeedback IOKit ]; @@ -50,14 +51,18 @@ in stdenv.mkDerivation rec { "-DDOLPHIN_WC_REVISION=${src.rev}" "-DDOLPHIN_WC_DESCRIBE=${version}" "-DDOLPHIN_WC_BRANCH=master" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + ]; + # - Allow Dolphin to use nix-provided libraries instead of building them - preConfigure = '' + postPatch = '' sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt @@ -66,18 +71,13 @@ in stdenv.mkDerivation rec { postInstall = '' cp -r ${desktopItem}/share/applications $out/share ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master - '' + stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/dolphin-emu-nogui \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ MP2E ashkitten ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. |