ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

dolphinEmuMaster: use Nix's libusb

Browse Source 
We were passing libusb-compat instead of libusb1, and the former no longer propagates the latter, so Dolphin built its vendored libusb.
This commit is contained in:
Jan Tojnar 2020-04-04 09:07:07 +02:00
parent 99fbfef024
commit 7c0a76d85e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , 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 , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
, miniupnpc, enet, mbedtls, soundtouch, sfml , miniupnpc, enet, mbedtls, soundtouch, sfml
, vulkan-loader ? null, libpulseaudio ? null , vulkan-loader ? null, libpulseaudio ? null
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo 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 qtbase
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
bluez udev libevdev alsaLib vulkan-loader bluez udev libevdev alsaLib vulkan-loader