From f0cd6223f7bbfd714cac8194e982d85b54a4d7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 21 Aug 2023 22:08:52 -0400 Subject: [PATCH] _7zz: replace rec with finalAttrs idiom --- pkgs/tools/archivers/7zz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 76605861c34e..6df03f1d83d2 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -24,12 +24,12 @@ let x86_64-linux = "../../cmpl_gcc_x64.mak"; }.${stdenv.hostPlatform.system} or "../../cmpl_gcc.mak"; # generic build in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "7zz"; version = "23.01"; src = fetchurl { - url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz"; + url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; hash = { free = "sha256-F1ybQsyReF2NBR/3eMZySvxVEntpwq2VUlRCHp/5nZs="; unfree = "sha256-NWBxAHNg5aGCTZkEmT6LJIC1G1cOjJ+vfA9Y6+S/n3Q="; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm555 -t $out/bin b/*/7zz${stdenv.hostPlatform.extensions.executable} - install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt + install -Dm444 -t $out/share/doc/${finalAttrs.pname} ../../../../DOC/*.txt runHook postInstall ''; @@ -124,4 +124,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; mainProgram = "7zz"; }; -} +})