diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-06 10:05:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-06 10:05:11 -0500 |
commit | 5bc72b87b1a82eccad03c9146a8ce86eeaa9153d (patch) | |
tree | cbc374a0ce687ebc0f4820ac12c2537b20ee00fc | |
parent | c3944ac91365ff99443d22466de1f6a12fa8412c (diff) | |
parent | fb7770b8439521c2a6aede7d4162c32d86c2659d (diff) |
Merge pull request #52714 from furrycatherder/gitea-pam
gogs, gitea: add PAM support
-rw-r--r-- | pkgs/applications/version-management/gitea/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/version-management/gogs/default.nix | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 54b7272b0d431..6f72b2e1775cd 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh +, git, bash, gzip, openssh, pam , sqliteSupport ? true +, pamSupport ? true }: with stdenv.lib; @@ -31,9 +32,11 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ optional pamSupport pam; - buildFlags = optional sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite" + ++ optional pamSupport "-tags pam"; buildFlagsArray = '' -ldflags= -X=main.Version=${version} diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 0b63a8f21985c..238540a1c9812 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh +, git, bash, gzip, openssh, pam , sqliteSupport ? true +, pamSupport ? true }: with stdenv.lib; @@ -23,9 +24,11 @@ buildGoPackage rec { substituteInPlace pkg/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ optional pamSupport pam; - buildFlags = optionalString sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite" + ++ optional pamSupport "-tags pam"; outputs = [ "bin" "out" "data" ]; |