Merge pull request #169561 from SuperSamus/dolphin-emu

dolphin-emu-{beta,primehack}: fix build
main
Sandro 2 years ago committed by GitHub
commit b6f3d3cd2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      pkgs/applications/emulators/dolphin-emu/master.nix
  2. 4
      pkgs/applications/emulators/dolphin-emu/primehack.nix

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
, libXrandr, libusb1, libpthreadstubs, libXext, libXxf86vm, libXinerama
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib
, miniupnpc, enet, mbedtls, soundtouch, sfml, writeScript
, miniupnpc, enet, mbedtls, soundtouch, sfml, xz, writeScript
, vulkan-loader ? null, libpulseaudio ? null
# - Inputs used for Darwin
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
buildInputs = [
curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp
portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml xz
qtbase
] ++ lib.optionals stdenv.isLinux [
bluez udev libevdev alsa-lib vulkan-loader

@ -14,7 +14,6 @@
, gettext
, libXrandr
, libusb1
, lzo
, libpthreadstubs
, libXext
, libXxf86vm
@ -34,6 +33,7 @@
, soundtouch
, sfml
, fmt
, xz
, vulkan-loader
, libpulseaudio
@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
readline
openal
libXdmcp
lzo
portaudio
libusb1
libpng
@ -92,6 +91,7 @@ stdenv.mkDerivation rec {
soundtouch
sfml
fmt
xz
qtbase
] ++ lib.optionals stdenv.isLinux [
bluez

Loading…
Cancel
Save