diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-04 09:07:07 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-04 09:07:07 +0200 |
| commit | 7c0a76d85e6b57924e73ad152387c2e49c674242 (patch) | |
| tree | 88b6ace916781d29f5b21d349b1bdcff2376eda7 /pkgs/misc | |
| parent | 99fbfef0246ecd3d25ae40c021c47b4e7dc90e9f (diff) | |
| download | nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.tar nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.tar.gz nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.tar.bz2 nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.tar.lz nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.tar.xz nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.tar.zst nixpkgs-7c0a76d85e6b57924e73ad152387c2e49c674242.zip | |
dolphinEmuMaster: use Nix's libusb
We were passing libusb-compat instead of libusb1, and the former no longer propagates the latter, so Dolphin built its vendored libusb.
Diffstat (limited to 'pkgs/misc')
| -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 e6e19e81242..938c5c37d3f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext -, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml , vulkan-loader ? null, libpulseaudio ? null @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml + portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader |