From 9685532ff58323181f6c7f79f1d0442a94a0b003 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 26 Jun 2024 09:47:57 +0200 Subject: [PATCH] got: add withSsh flag and defaultEditor parameter --- pkgs/by-name/go/got/package.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 7faf1ff013a5..69ef68a8f609 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -13,6 +13,10 @@ , bison , autoPatchelfHook , testers +, signify +, withSsh ? true, openssh +# Default editor to use when neither VISUAL nor EDITOR are defined +, defaultEditor ? null }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +41,18 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace configure --replace-fail 'xdarwin' 'xhomebrew' ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (defaultEditor != null) [ + ''-DGOT_DEFAULT_EDITOR="${lib.getExe defaultEditor}"'' + ] ++ lib.optionals withSsh [ + ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' + ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' + ] ++ lib.optionals stdenv.isLinux [ + ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ] ++ lib.optionals stdenv.isDarwin [ # error: conflicting types for 'strmode' "-DHAVE_STRMODE=1" # Undefined symbols for architecture arm64: "_bsd_getopt"