colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52714 from furrycatherder/gitea-pam

Browse Source 
gogs, gitea: add PAM support
This commit is contained in:
Matthew Bauer 2019-03-06 10:05:11 -05:00 committed by GitHub
commit 5bc72b87b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/version-management/gitea/default.nix
View File

@ -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}

9
pkgs/applications/version-management/gogs/default.nix
View File

@ -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" ];