diff options
| author | Rick van Schijndel <rol3517@gmail.com> | 2021-07-27 19:11:46 +0200 |
|---|---|---|
| committer | Rick van Schijndel <rol3517@gmail.com> | 2021-07-27 19:11:55 +0200 |
| commit | ec518eb21b59bedf055167ba525174d82867022a (patch) | |
| tree | b06a0d0d7b4ae93a4a36ab539d0af2fa134bb00a | |
| parent | 407ef1dc6f91f9ecf7f61e4dfaedcde052f2bd17 (diff) | |
| download | nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.tar nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.tar.gz nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.tar.bz2 nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.tar.lz nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.tar.xz nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.tar.zst nixpkgs-ec518eb21b59bedf055167ba525174d82867022a.zip | |
cgit: support cross-compilation
asciidoc was in the incorrect location, and CC and AR must be set explictly.
| -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: |