diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
| commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
| tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/doc | |
| parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
| parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
| download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip | |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/doc')
| -rw-r--r-- | nixpkgs/doc/Makefile | 14 | ||||
| -rw-r--r-- | nixpkgs/doc/stdenv.xml | 14 |
2 files changed, 23 insertions, 5 deletions
diff --git a/nixpkgs/doc/Makefile b/nixpkgs/doc/Makefile index 91b62fe138bc..cd6d7eb8d1c8 100644 --- a/nixpkgs/doc/Makefile +++ b/nixpkgs/doc/Makefile @@ -21,7 +21,7 @@ fix-misc-xml: .PHONY: clean clean: - rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml + rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml functions/library/generated rm -rf ./out/ ./highlightjs .PHONY: validate @@ -71,16 +71,22 @@ highlightjs: cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/ -manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml *.xml **/*.xml **/**/*.xml +manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml functions/library/generated *.xml **/*.xml **/**/*.xml xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml .version: nix-instantiate --eval \ -E '(import ../lib).version' > .version +function_locations := $(shell nix-build --no-out-link ./lib-function-locations.nix) + functions/library/locations.xml: - nix-build ./lib-function-locations.nix \ - --out-link ./functions/library/locations.xml + ln -s $(function_locations) ./functions/library/locations.xml + +functions/library/generated: + nix-build ./lib-function-docs.nix \ + --arg locationsXml $(function_locations)\ + --out-link ./functions/library/generated %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/nixpkgs/doc/stdenv.xml b/nixpkgs/doc/stdenv.xml index 3a51907eb8a6..81bd4556193f 100644 --- a/nixpkgs/doc/stdenv.xml +++ b/nixpkgs/doc/stdenv.xml @@ -1666,6 +1666,18 @@ installTargets = "install-bin install-doc";</programlisting> </varlistentry> <varlistentry> <term> + <varname>dontPruneLibtoolFiles</varname> + </term> + <listitem> + <para> + If set, libtool <literal>.la</literal> files associated with shared + libraries won't have their <literal>dependency_libs</literal> field + cleared. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> <varname>forceShare</varname> </term> <listitem> @@ -1800,7 +1812,7 @@ set debug-file-directory ~/.nix-profile/lib/debug <listitem> <para> A list of dependencies used by the phase. This gets included in - <varname>buildInputs</varname> when <varname>doInstallCheck</varname> is + <varname>nativeBuildInputs</varname> when <varname>doInstallCheck</varname> is set. </para> </listitem> |