diff options
| -rw-r--r-- | pkgs/build-support/setup-hooks/move-docs.sh | 24 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 19 |
3 files changed, 26 insertions, 20 deletions
diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh new file mode 100644 index 000000000000..b3b931935508 --- /dev/null +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -0,0 +1,24 @@ +# This setup hook automatically moves $out/{man,doc,info} to +# $out/share. + +preFixupHooks+=(_moveDocs) + +_moveDocs() { + forceShare=${forceShare:=man doc info} + if [ -z "$forceShare" ]; then return; fi + + for d in $forceShare; do + if [ -d "$prefix/$d" ]; then + if [ -d "$prefix/share/$d" ]; then + echo "both $d/ and share/$d/ exist!" + else + echo "moving $prefix/$d to $prefix/share/$d" + mkdir -p $prefix/share + if [ -w $prefix/share ]; then + mv $prefix/$d $prefix/share + ln -s share/$d $prefix + fi + fi + fi + done +} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 0ff0bcebbd46..5b3cfdc2c44c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -30,7 +30,8 @@ let unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); extraBuildInputs' = extraBuildInputs ++ - [ ../../build-support/setup-hooks/compress-man-pages.sh + [ ../../build-support/setup-hooks/move-docs.sh + ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/strip.sh ../../build-support/setup-hooks/patch-shebangs.sh gcc diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ebacb9952fcf..ea2ea947b505 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -701,25 +701,6 @@ fixupPhase() { runHook preFixup - # Put man/doc/info under $out/share. - forceShare=${forceShare:=man doc info} - if [ -n "$forceShare" ]; then - for d in $forceShare; do - if [ -d "$prefix/$d" ]; then - if [ -d "$prefix/share/$d" ]; then - echo "both $d/ and share/$d/ exists!" - else - echo "fixing location of $d/ subdirectory" - mkdir -p $prefix/share - if [ -w $prefix/share ]; then - mv -v $prefix/$d $prefix/share - ln -sv share/$d $prefix - fi - fi - fi - done; - fi - # Apply fixup to each output. local output for output in $outputs; do |