Skip to content

Commit

Permalink
oidc-agent: reformat code, fix wrong man page location (NixOS#339707)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lassulus authored Sep 20, 2024
2 parents 98a31cd + 57737e2 commit 574d4f7
Showing 1 changed file with 25 additions and 16 deletions.
41 changes: 25 additions & 16 deletions pkgs/by-name/oi/oidc-agent/package.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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 { };
Expand All @@ -58,4 +68,3 @@ stdenv.mkDerivation rec {
license = licenses.mit;
};
}

0 comments on commit 574d4f7

Please sign in to comment.