public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fujprog: fix MacOS build by adding IOKit dependency and add changelog

Browse Source
This commit is contained in:
Tom Repetti 2020-10-12 12:29:44 -04:00
parent 02e2b63aa2
commit eeb3c1f726
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/misc/fujprog/default.nix
View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkgconfig , pkgconfig
, IOKit
, libftdi1 , libftdi1
, libusb-compat-0_1 , libusb-compat-0_1
}: }:
@ -25,13 +26,14 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libftdi1 libftdi1
libusb-compat-0_1 libusb-compat-0_1
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; { 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"; homepage = "https://github.com/kost/fujprog";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ trepetti ]; maintainers = with maintainers; [ trepetti ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.all;
changelog = "https://github.com/kost/fujprog/releases/tag/v${version}";
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -11033,7 +11033,9 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices; 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 { }; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };