alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
Add myself to maintainers and change meta.platforms to platforms.linux
due to build failures on Darwin.
This commit is contained in:
Richard Marko 2020-02-01 18:40:01 +01:00
parent bb73acd27f
commit 87057d9bdc
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/tools/misc/blackmagic/default.nix
View file

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

13
pkgs/development/tools/misc/blackmagic/helper.sh
View file

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