From 57737e22bd80c08ebc53cc204f4abd3a2e7108ee Mon Sep 17 00:00:00 2001 From: xinyangli Date: Thu, 5 Sep 2024 12:13:46 +0800 Subject: [PATCH] oidc-agent: reformat code, fix wrong man page location --- pkgs/by-name/oi/oidc-agent/package.nix | 41 ++++++++++++++++---------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 2be9a24f7db6..b1e3dcd844ff 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, curl -, webkitgtk -, libmicrohttpd -, libsecret -, qrencode -, libsodium -, pkg-config -, help2man -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + curl, + webkitgtk, + libmicrohttpd, + libsecret, + qrencode, + libsodium, + pkg-config, + help2man, + nix-update-script, }: stdenv.mkDerivation rec { @@ -39,14 +40,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" "BIN_PATH=$(out)" "LIB_PATH=$(out)/lib" ]; + makeFlags = [ + "PREFIX=$(out)" + "BIN_PATH=$(out)" + "PROMPT_BIN_PATH=$(out)" + "LIB_PATH=$(out)/lib" + ]; - installTargets = [ "install_bin" "install_lib" "install_conf" ]; + installTargets = [ + "install_bin" + "install_lib" + "install_conf" + ]; postFixup = '' # Override with patched binary to be used by help2man cp -r $out/bin/* bin - make install_man PREFIX=$out + make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man ''; passthru.updateScript = nix-update-script { }; @@ -58,4 +68,3 @@ stdenv.mkDerivation rec { license = licenses.mit; }; } -