From df5c71b008ca914712c1f9c73f51f722f1ca12c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 19 Jul 2022 17:55:06 +0200 Subject: [PATCH] noti: bump golang.org/x/sys --- pkgs/tools/misc/noti/default.nix | 34 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index c964a8872f8..ac3ff7a59b7 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,7 +1,13 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub -, Cocoa ? null }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, fetchurl +, Cocoa +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "noti"; version = "3.5.0"; @@ -12,17 +18,29 @@ buildGoPackage rec { sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd"; }; + patches = [ + # update golang.org/x/sys to fix building on aarch64-darwin + # using fetchurl because fetchpatch breaks the patch + (fetchurl { + url = "https://github.com/variadico/noti/commit/a90bccfdb2e6a0adc2e92f9a4e7be64133832ba9.patch"; + sha256 = "sha256-vSAwuAR9absMSFqGOlzmRZoOGC/jpkmh8CMCVjeleUo="; + }) + ]; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin Cocoa; - goPackagePath = "github.com/variadico/noti"; - ldflags = [ - "-X ${goPackagePath}/internal/command.Version=${version}" + "-s" + "-w" + "-X github.com/variadico/noti/internal/command.Version=${version}" ]; postInstall = '' - install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 - install -Dm444 -t $out/share/man/man5 $src/docs/man/*.5 + installManPage docs/man/* ''; meta = with lib; {