diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-10-11 14:40:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 14:40:39 +0200 |
| commit | 56a2ea8db4b795b18ba71d91db3e8e5ea83214d4 (patch) | |
| tree | 34b890cb5847057e0d9744741720f47b46ea873d /pkgs/development/embedded | |
| parent | e325d85f0fff8c3a478d8ef2426148e8118d3ecd (diff) | |
| parent | f6dc0eefb96c8db7680f36f308b67acb79e422b1 (diff) | |
| download | nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.tar nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.tar.gz nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.tar.bz2 nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.tar.lz nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.tar.xz nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.tar.zst nixlib-56a2ea8db4b795b18ba71d91db3e8e5ea83214d4.zip | |
Merge pull request #195517 from wegank/avrdude-darwin
avrdude: fix build on aarch64-darwin
Diffstat (limited to 'pkgs/development/embedded')
| -rw-r--r-- | pkgs/development/embedded/avrdude/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 83dbf2a18fae..a6ddb17f9280 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -9,16 +9,22 @@ stdenv.mkDerivation rec { pname = "avrdude"; version = "7.0"; - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-wO9l2Y1gQMoLTytwDVFGPCoflGZUQfOdFdl0Qtu3m1Q="; + src = fetchFromGitHub { + owner = "avrdudes"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-T8MKrvBvFF3WFwBMIN75vCOS0khliHQI+GGQvCk7T1o="; }; - configureFlags = lib.optionals docSupport "--enable-doc"; + nativeBuildInputs = [ cmake bison flex ]; - buildInputs = [ bison flex libusb-compat-0_1 libelf libftdi1 readline ] + buildInputs = [ libusb-compat-0_1 libelf libftdi1 readline ] ++ lib.optionals docSupport [ texLive texinfo texi2html ]; + cmakeFlags = lib.optionals docSupport [ + "-DBUILD_DOC=ON" + ]; + meta = with lib; { description = "Command-line tool for programming Atmel AVR microcontrollers"; longDescription = '' |