From f91f250870edc8dbc363879e441b181e3cf8a338 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Nov 2024 00:37:56 +0100 Subject: [PATCH] unrar: 7.0.9 -> 7.1.1, refactor --- pkgs/by-name/un/unrar/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index 6a71c63d9e2d..b5edc7eb2311 100644 --- a/pkgs/by-name/un/unrar/package.nix +++ b/pkgs/by-name/un/unrar/package.nix @@ -1,28 +1,32 @@ -{ lib -, stdenv -, fetchzip +{ + lib, + stdenv, + fetchzip, }: stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "7.0.9"; + version = "7.1.1"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-lHh02uqHdX2Q9yyaGiHlkdBjlQE1tQyB44d39yDE4ls="; + hash = "sha256-dGF5xCZRHnaMVj/OGIIFbytN7Jnj39gq7ym6hq/EZsk="; }; sourceRoot = finalAttrs.src.name; postPatch = '' substituteInPlace unrar/makefile \ - --replace "CXX=" "#CXX=" \ - --replace "STRIP=" "#STRIP=" \ - --replace "AR=" "#AR=" + --replace-fail "CXX=" "#CXX=" \ + --replace-fail "STRIP=" "#STRIP=" \ + --replace-fail "AR=" "#AR=" ''; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; # `make {unrar,lib}` call `make clean` implicitly # separate build into different dirs to avoid deleting them