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

2021-05-14 21:57:09 -07:00
parent c48eaa70e3 72948af15b
commit 0546e68ef7
13 changed files with 107 additions and 25 deletions
--- a/pkgs/development/tools/ecpdap/default.nix
+++ b/pkgs/development/tools/ecpdap/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, pkg-config, libusb1 }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libusb1, AppKit }:

 rustPlatform.buildRustPackage rec {
  pname = "ecpdap";
@@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ libusb1 ];
+  buildInputs = [ libusb1 ]
+    ++ lib.optional stdenv.isDarwin AppKit;

  postInstall = ''
    mkdir -p $out/etc/udev/rules.d