diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index 1926bf2547428..db4fa214b380e 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -2,27 +2,44 @@ lib, stdenvNoCC, fetchurl, - installShellFiles, + libarchive, + p7zip, testers, mas, }: stdenvNoCC.mkDerivation rec { pname = "mas"; - version = "1.8.6"; + version = "1.9.0"; src = fetchurl { - # Use the tarball until https://github.com/mas-cli/mas/issues/452 is fixed. - # Even though it looks like an OS/arch specific build it is actually a universal binary. - url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.monterey.bottle.tar.gz"; - sha256 = "0q4skdhymgn5xrwafyisfshx327faia682yv83mf68r61m2jl10d"; + url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.pkg"; + hash = "sha256-MiSrCHLby3diTAzDPCYX1ZwdmzcHwOx/UJuWrlRJe54="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + libarchive + p7zip + ]; + + unpackPhase = '' + runHook preUnpack + + 7z x $src + bsdtar -xf Payload~ + + runHook postUnpack + ''; + + dontBuild = true; installPhase = '' - install -D './${version}/bin/mas' "$out/bin/mas" - installShellCompletion --cmd mas --bash './${version}/etc/bash_completion.d/mas' + runHook preInstall + + mkdir -p $out/bin + cp mas $out/bin + + runHook postInstall ''; passthru.tests = {