From 9406f240a7b5ed68e8e633b8c764cfd69c470696 Mon Sep 17 00:00:00 2001 From: Sean Haugh Date: Sat, 22 Dec 2018 18:49:25 -0600 Subject: [PATCH 1/2] gitea: add PAM support --- pkgs/applications/version-management/gitea/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index eca07b81bacc..61655eff775a 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} From fb7770b8439521c2a6aede7d4162c32d86c2659d Mon Sep 17 00:00:00 2001 From: Sean Haugh Date: Sat, 22 Dec 2018 18:52:39 -0600 Subject: [PATCH 2/2] gogs: add PAM support --- pkgs/applications/version-management/gogs/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 56e411368961..2f5230b6d29d 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" ];