diff options
| author | Domen Kožar <domen@dev.si> | 2021-07-27 21:57:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 21:57:36 +0200 |
| commit | 16b7e4900ebb66db4414694f91a7c22214a16440 (patch) | |
| tree | 514cc1a1e651e877df85991d520762c6ad545560 | |
| parent | 9de184f9bcedf86d3fa6e4ed9195775d421e8973 (diff) | |
| parent | ec518eb21b59bedf055167ba525174d82867022a (diff) | |
| download | nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.tar nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.tar.gz nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.tar.bz2 nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.tar.lz nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.tar.xz nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.tar.zst nixpkgs-16b7e4900ebb66db4414694f91a7c22214a16440.zip | |
Merge pull request #131705 from Mindavi/cgit/cross
cgit: support cross-compilation
| -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..a38055d9b21 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: |