Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 13477c7f3ba3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b61fba0ce98a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 30, 2019

  1. gitea: Fix sqlite support and baked-in tags

    @srhb
    srhb committed Mar 30, 2019
    Copy the full SHA
    7b64309 View commit details

  2. Merge pull request #58584 from srhb/gitea-tags-fix 

    gitea: Fix sqlite support and baked-in tags
    @Ma27
    Ma27 authored Mar 30, 2019
    Copy the full SHA
    b61fba0 View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/applications/version-management/gitea/default.nix
15 changes: 9 additions & 6 deletions pkgs/applications/version-management/gitea/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,12 +35,15 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ]
++ optional pamSupport pam;

buildFlags = optional sqliteSupport "-tags sqlite"
++ optional pamSupport "-tags pam";
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}
${optionalString sqliteSupport "-X=main.Tags=sqlite"}
preBuild = let
tags = optional pamSupport "pam"
++ optional sqliteSupport "sqlite";
tagsString = concatStringsSep " " tags;
in ''
export buildFlagsArray=(
-tags="${tagsString}"
-ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
)
'';

outputs = [ "bin" "out" "data" ];