Merge pull request #58598 from AerialX/mspdebug-parallel
mspdebug: darwin fixes and enableParallelBuilding
This commit is contained in:
commit
cbb7c81ac6
@ -1,10 +1,22 @@
|
|||||||
{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }:
|
{ stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, autoPatchelfHook
|
||||||
|
, libusb-compat-0_1
|
||||||
|
, readline ? null
|
||||||
|
, enableReadline ? true
|
||||||
|
, hidapi ? null
|
||||||
|
, pkg-config ? null
|
||||||
|
, mspds ? null
|
||||||
|
, enableMspds ? false
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
assert stdenv.isDarwin -> hidapi != null && pkg-config != null;
|
||||||
|
assert enableReadline -> readline != null;
|
||||||
|
assert enableMspds -> mspds != null;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
version = "0.25";
|
version = "0.25";
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "mspdebug";
|
pname = "mspdebug";
|
||||||
inherit version;
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dlbeer";
|
owner = "dlbeer";
|
||||||
repo = "mspdebug";
|
repo = "mspdebug";
|
||||||
@ -12,9 +24,34 @@ in stdenv.mkDerivation {
|
|||||||
sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
|
sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libusb-compat-0_1 readline ];
|
enableParallelBuilding = true;
|
||||||
makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++
|
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config
|
||||||
(if readline == null then [ "WITHOUT_READLINE=1" ] else []);
|
++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
|
||||||
|
buildInputs = [ libusb-compat-0_1 ]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin hidapi
|
||||||
|
++ stdenv.lib.optional enableReadline readline;
|
||||||
|
|
||||||
|
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
|
# TODO: remove once a new 0.26+ release is made
|
||||||
|
substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||||
|
|
||||||
|
# Makefile only uses pkg-config if it detects homebrew
|
||||||
|
substituteInPlace Makefile --replace brew true
|
||||||
|
'';
|
||||||
|
|
||||||
|
# TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+
|
||||||
|
runtimeDependencies = stdenv.lib.optional enableMspds mspds;
|
||||||
|
postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) ''
|
||||||
|
# autoPatchelfHook only works on linux so...
|
||||||
|
for dep in $runtimeDependencies; do
|
||||||
|
install_name_tool -add_rpath $dep/lib $out/bin/$pname
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
|
||||||
|
makeFlags = [ "UNAME_S=$(unameS)" ] ++
|
||||||
|
stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1";
|
||||||
|
unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";
|
description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user