diff options
| author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
| commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
| tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/applications/version-management/git-and-tools/cgit/default.nix | |
| parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
| parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
| download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip | |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/cgit/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/cgit/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index f48fe4b1ec4..b8f7cee7358 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit + openssl zlib libxml2 libxslt docbook_xsl luajit ]; pythonPath = [ pygments markdown ]; @@ -48,10 +48,15 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p git tar --strip-components=1 -xf "$gitSrc" -C git - - makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/") ''; + makeFlags = [ + "prefix=$(out)" + "CGIT_SCRIPT_PATH=$(out)/cgit/" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + # Install manpage. postInstall = '' # xmllint fails: |