From 4694b671b1aa47d4ee38556b56e6f71452065bb0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 19 Aug 2020 19:35:14 -0500 Subject: [PATCH 1/2] undmg: 1.0.5 -> 1.1.0 --- pkgs/tools/archivers/undmg/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 3641893cf743..0eaabdb627da 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, zlib, bzip2 }: +{ stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.1.0"; pname = "undmg"; src = fetchFromGitHub { owner = "matthewbauer"; repo = "undmg"; rev = "v${version}"; - sha256 = "0yz5fniaa5z33d8bdzgr263957r1c9l99237y2p8k0hdid207la1"; + sha256 = "0rb4h89jrl04vwf6p679ipa4mp95hzmc1ca11wqbanv3xd1kcpxm"; }; - buildInputs = [ zlib bzip2 ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ zlib bzip2 lzfse ]; setupHook = ./setup-hook.sh; From e57df5816dc2f3d3f179ceb187305ad344f39458 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 19 Aug 2020 19:35:29 -0500 Subject: [PATCH 2/2] undmg: use file name instead of pipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s some issue in really big files with pipes that doesn’t occur in filename decompression. --- pkgs/tools/archivers/undmg/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/tools/archivers/undmg/setup-hook.sh index e5c8dda23b6a..bc7ed76107ef 100644 --- a/pkgs/tools/archivers/undmg/setup-hook.sh +++ b/pkgs/tools/archivers/undmg/setup-hook.sh @@ -1,5 +1,5 @@ unpackCmdHooks+=(_tryUnpackDmg) _tryUnpackDmg() { if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi - undmg < "$curSrc" + undmg "$curSrc" }