diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 1fb0741061a22..29edb66f9f5f1 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, elfutils +{ lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, pkg-config, libusb1, elfutils , libftdi1, readline, hidapi, libserialport, libusb-compat-0_1 # Documentation building doesn't work on Darwin. It fails with: # Undefined subroutine &Locale::Messages::dgettext called in ... texi2html @@ -12,16 +12,16 @@ in stdenv.mkDerivation (finalAttrs: { pname = "avrdude"; - version = "7.3"; + version = "8.0"; src = fetchFromGitHub { owner = "avrdudes"; - repo = "avdude"; + repo = "avrdude"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-JqW3AOMmAfcy+PQRcqviWlxA6GoMSEfzIFt1pRYY7Dw="; + sha256 = "w58HVCvKuWpGJwllupbj7ndeq4iE9LPs/IjFSUN0DOU="; }; - nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [ + nativeBuildInputs = [ cmake bison flex pkg-config ] ++ lib.optionals docSupport [ unixtools.more texliveMedium texinfo @@ -48,11 +48,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ]; - # dvips output references texlive in comments, resulting in a huge closure - postInstall = lib.optionalString docSupport '' - rm $out/share/doc/avrdude/*.ps - ''; - passthru = { # Vendored and mutated copy of libelf for avrdudes use. # Produces a static library only.