diff options
| author | Tom Repetti <trepetti@cs.columbia.edu> | 2020-10-12 12:29:44 -0400 |
|---|---|---|
| committer | Tom Repetti <trepetti@cs.columbia.edu> | 2020-10-12 15:28:36 -0400 |
| commit | eeb3c1f72677554d45fe8341f0748058862eb357 (patch) | |
| tree | 4f6e2bb9ec917923bfeff6b13701f35f626c8186 /pkgs | |
| parent | 02e2b63aa2ad8d8c49b90d253eb62235006047ef (diff) | |
fujprog: fix MacOS build by adding IOKit dependency and add changelog
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/fujprog/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index 61aeea9967d3..9a56daf5d37e 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , pkgconfig +, IOKit , libftdi1 , libusb-compat-0_1 }: @@ -25,13 +26,14 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb-compat-0_1 - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { - description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards."; + description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; homepage = "https://github.com/kost/fujprog"; license = licenses.bsd2; maintainers = with maintainers; [ trepetti ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; + changelog = "https://github.com/kost/fujprog/releases/tag/v${version}"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab0a1cf5c2f5..ec91bb18f2f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11033,7 +11033,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fujprog = callPackage ../development/tools/misc/fujprog { }; + fujprog = callPackage ../development/tools/misc/fujprog { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; |