Merge master into staging-next

2021-04-03 00:14:57 +00:00
parent b3a0328b7f 11910695f6
commit 74200a7126
60 changed files with 8100 additions and 2479 deletions
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, lib, fetchFromGitHub, fetchpatch
 , gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
 , python3
 }:
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

+  patches = [
+    # Fix deprecation warning with libftdi 1.5
+    (fetchpatch {
+      url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch";
+      sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5";
+    })
+  ];
+
  nativeBuildInputs = [
    gcc-arm-embedded pkg-config
    python3