blackmagic: add libusb, pkgconfig. expose pc-* (hosted) targets

Add myself to maintainers and change meta.platforms to platforms.linux
due to build failures on Darwin.
wip/yesman
Richard Marko 4 years ago
parent bb73acd27f
commit 87057d9bdc
  1. 11
      pkgs/development/tools/misc/blackmagic/default.nix
  2. 13
      pkgs/development/tools/misc/blackmagic/helper.sh

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1
, gcc-arm-embedded, libftdi1, libusb, pkgconfig
, python, pythonPackages
}:
@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
gcc-arm-embedded
gcc-arm-embedded pkgconfig
];
buildInputs = [
libftdi1
libusb
python
pythonPackages.intelhex
];
@ -60,7 +61,9 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/blacksphere/blackmagic;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pjones emily ];
platforms = platforms.unix;
maintainers = with maintainers; [ pjones emily sorki ];
# fails on darwin with
# arm-none-eabi-gcc: error: unrecognized command line option '-iframework'
platforms = platforms.linux;
};
}

@ -23,11 +23,18 @@ make_platform() {
make clean
make PROBE_HOST="$1"
if [ "$1" = libftdi ]; then
mkdir -p "$out/bin"
if [ "$1" = "libftdi" ]; then
install -m 0555 blackmagic "$out/bin"
fi
if [ "$1" = "pc-hosted" ]; then
install -m 0555 blackmagic_hosted "$out/bin"
fi
if [ "$1" = "pc-stlinkv2" ]; then
install -m 0555 blackmagic_stlinkv2 "$out/bin"
fi
for f in $PRODUCTS; do
if [ -r "$f" ]; then
mkdir -p "$out/firmware/$1"
@ -45,6 +52,8 @@ make -C libopencm3
# And now all of the platforms:
cd src
mkdir -p "$out/bin"
for platform in platforms/*/Makefile.inc; do
probe=$(basename "$(dirname "$platform")")
make_platform "$probe"

Loading…
Cancel
Save