diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index c49187273c46..f3b3b0b2d04b 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, fetchpatch , gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config -, python, pythonPackages +, python3 }: with lib; @@ -19,17 +19,26 @@ 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 ]; buildInputs = [ libftdi1 libusb-compat-0_1 - python - pythonPackages.intelhex ]; + strictDeps = true; + postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ @@ -42,7 +51,7 @@ stdenv.mkDerivation rec { ''; buildPhase = "${stdenv.shell} ${./helper.sh}"; - installPhase = ":"; # buildPhase does this. + dontInstall = true; enableParallelBuilding = true; |