From ce5a09007555e5c36643a7a74a7483db62a4e97b Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 2 May 2019 01:15:33 +0900 Subject: [PATCH] stlink: fix Darwin build Upstream supports various Unixes, so optimistically set platforms to `unix` even though we're only going to build it on Linux and Darwin. --- pkgs/development/tools/misc/stlink/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index de13f6709b2..90f901e5112 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor maintainers.rongcuid ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f84e3336e2..821ea264dfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13097,7 +13097,10 @@ in stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { }; + stlink = callPackage ../development/tools/misc/stlink { + # The Darwin build of stlink explicitly refers to static libusb. + libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + }; steghide = callPackage ../tools/security/steghide {};