From 07b7ca8345611c1e46fde38ae40397737e4695d7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 12:59:01 -0700 Subject: [PATCH] avrdude: use finalAttrs instead of rec --- pkgs/development/embedded/avrdude/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index b3d6d25f4502..41b6c5ffc940 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -10,14 +10,14 @@ let useElfutils = lib.meta.availableOn stdenv.hostPlatform elfutils; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avrdude"; version = "7.3"; src = fetchFromGitHub { owner = "avrdudes"; - repo = pname; - rev = "v${version}"; + repo = "avdude"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JqW3AOMmAfcy+PQRcqviWlxA6GoMSEfzIFt1pRYY7Dw="; }; @@ -43,16 +43,13 @@ stdenv.mkDerivation rec { ''; # Not used: - # # -DHAVE_LINUXGPIO=ON because it's incompatible with libgpiod 2.x - # - cmakeFlags = [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ] - ++ lib.optionals docSupport [ "-DBUILD_DOC=ON" ]; + 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/${pname}/*.ps + rm $out/share/doc/avrdude/*.ps ''; passthru = { @@ -74,4 +71,4 @@ stdenv.mkDerivation rec { platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; -} +})