Merge remote-tracking branch 'origin/master' into staging-next

Fix cargo-flash build
This commit is contained in:
Jonathan Ringer
2021-05-16 18:27:14 -07:00
80 changed files with 906 additions and 354 deletions
+10 -5
View File
@@ -2,8 +2,10 @@
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, bluez
, libobjc
, Foundation
, IOBluetooth
}:
stdenv.mkDerivation rec {
@@ -19,15 +21,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ (lib.getDev bluez) ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Foundation IOBluetooth ];
cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=NO" ];
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=OFF" ];
meta = with lib; {
description = "Feature complete cross-platform Wii Remote access library";
license = licenses.gpl3;
license = licenses.gpl3Plus;
homepage = "https://github.com/wiiuse/wiiuse";
maintainers = with maintainers; [ shamilton ];
platforms = with platforms; linux;
platforms = with platforms; unix;
};
}