public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv/multiple-outputs.sh: small tweaks

Browse Source 
- fix in silencing some moveToOutput messages
- allow removing (developer) documentation even without defining outputs
  (note: some paths are auto-removed by default, e.g. gtk-doc and man3)
This commit is contained in:
Vladimír Čunát 2016-01-02 11:18:27 +01:00
parent e22d26bedb
commit 19d22184d3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@ -106,7 +106,7 @@ moveToOutput() {
if rmdir "$srcParent"; then if rmdir "$srcParent"; then
echo "Removing empty $srcParent/ and (possibly) its parents" echo "Removing empty $srcParent/ and (possibly) its parents"
rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \ rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \
> /dev/null || true # doesn't ignore failure for some reason 2> /dev/null || true # doesn't ignore failure for some reason
fi fi
done done
done done
@ -114,7 +114,6 @@ moveToOutput() {
# Move documentation to the desired outputs. # Move documentation to the desired outputs.
_multioutDocs() { _multioutDocs() {
if [ "$outputs" = "out" ]; then return; fi;
local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo} local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo}
moveToOutput share/info "${!outputInfo}" moveToOutput share/info "${!outputInfo}"

2
pkgs/development/tools/documentation/gtk-doc/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"; sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l";
}; };
outputDocdev = "out";
# maybe there is a better way to pass the needed dtd and xsl files # maybe there is a better way to pass the needed dtd and xsl files
# "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
preConfigure = '' preConfigure = ''