From 4ff9578411c81cf2ac8040579de413a152a12a5e Mon Sep 17 00:00:00 2001 From: Jay Rovacsek Date: Wed, 18 May 2022 01:57:38 +0000 Subject: [PATCH] dockutil 2.0.5 -> 3.0.2 (#167488) * dockutil 2.0.5 -> 3.0.2 Implement required changes to dockutil to handle newer version of package: 3.0.2 * Add gzip to inputs, remove pbzx as it is unused * Utilise recommended changes reducing build dependencies and following darwin patterns more closely. Note; this changeset does maintain the symlinking of $out/usr/local/bin in order to resolve an issue with crashing. * Apply format/lint with nixfmt --- pkgs/os-specific/darwin/dockutil/default.nix | 27 ++++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/os-specific/darwin/dockutil/default.nix index d937ce8fd12..5e4187f0728 100644 --- a/pkgs/os-specific/darwin/dockutil/default.nix +++ b/pkgs/os-specific/darwin/dockutil/default.nix @@ -1,24 +1,29 @@ -{ lib, stdenv, fetchFromGitHub }: - +{ lib, stdenv, fetchurl, libarchive, p7zip }: stdenv.mkDerivation rec { pname = "dockutil"; - version = "2.0.5"; + version = "3.0.2"; - src = fetchFromGitHub { - owner = "kcrawford"; - repo = "dockutil"; - rev = version; - sha256 = "sha256-8tDkueCTCtvxc7owp3K9Tsrn4hL79CM04zBNv7AcHgA="; + src = fetchurl { + url = + "https://github.com/kcrawford/dockutil/releases/download/${version}/dockutil-${version}.pkg"; + sha256 = "175137ea747e83ed221d60b18b712b256ed31531534cde84f679487d337668fd"; }; dontBuild = true; + nativeBuildInputs = [ libarchive p7zip ]; + + unpackPhase = '' + 7z x $src + bsdtar -xf Payload~ + ''; + installPhase = '' runHook preInstall - mkdir -p $out/bin - install -Dm755 scripts/dockutil -t $out/bin - + mkdir -p $out/usr/local/bin + install -Dm755 usr/local/bin/dockutil -t $out/usr/local/bin + ln -rs $out/usr/local/bin/dockutil $out/bin/dockutil runHook postInstall '';