cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #81042 from KoviRobi/zhf-20.03-fix-noweb

Browse source 
noweb: fix installation of manpages, use placeholders
This commit is contained in:
Matthew Bauer 2020-03-21 23:21:19 -04:00 committed by GitHub
commit 6b95893a6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/tools/literate-programming/noweb/default.nix
View file

@ -27,16 +27,19 @@ let noweb = stdenv.mkDerivation rec {
"CC=clang" "CC=clang"
]; ];
installFlags = [ installFlags = [
"BIN=$(out)/bin"
"ELISP=$(out)/share/emacs/site-lisp"
"LIB=$(out)/lib/noweb"
"MAN=$(out)/share/man"
"TEXINPUTS=$(tex)/tex/latex/noweb"
]; ];
preInstall = '' preInstall = ''
mkdir -p "$tex/tex/latex/noweb" mkdir -p "$tex/tex/latex/noweb"
installFlagsArray+=( \
"BIN=${placeholder "out"}/bin" \
"ELISP=${placeholder "out"}/share/emacs/site-lisp" \
"LIB=${placeholder "out"}/lib/noweb" \
"MAN=${placeholder "out"}/share/man" \
"TEXINPUTS=${placeholder "tex"}/tex/latex/noweb" \
)
''; '';
installTargets = [ "install-code" "install-tex" "install-elisp" ]; installTargets = [ "install-code" "install-tex" "install-elisp" ];
@ -57,7 +60,7 @@ let noweb = stdenv.mkDerivation rec {
# HACK: This is ugly, but functional. # HACK: This is ugly, but functional.
PATH=$out/bin:$PATH make -BC xdoc PATH=$out/bin:$PATH make -BC xdoc
make "''${installFlags[@]} install-man" make "''${installFlagsArray[@]}" install-man
ln -s "$tex" "$out/share/texmf" ln -s "$tex" "$out/share/texmf"
''; '';