mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Remove obsolete scatter output hook
There are no users of it in main tree and recent merge of multiple outputs branch makes it obsolete for private trees too. At the time hook was created, recently merged multiple output branch was relying on passing flags to autotools to split outputs, which obviously wasn't working for other build systems Scatter output was taking different approach where files were moved out from a build tree based on known paths, which is more or less what current multiple-outputs.sh hook is able to do too.
This commit is contained in:
parent
a84799fe8b
commit
dea920bfdc
@ -1,56 +0,0 @@
|
||||
preFixupPhases+=" scatter_files"
|
||||
preDistPhases+=" propagate_bin_input"
|
||||
|
||||
SCATTER_BIN_DEFAULT=${SCATTER_BIN_DEFAULT:-"/lib/*.so* /bin/*"}
|
||||
SCATTER_DOC_DEFAULT=${SCATTER_DOC_DEFAULT:-"/share/man/* /share/doc/*"}
|
||||
|
||||
|
||||
scatter_files() {
|
||||
save_nullglob=$(shopt -p nullglob)
|
||||
for o in $outputs; do
|
||||
[[ "$o" == "out" ]] && continue
|
||||
v=files_${o}
|
||||
|
||||
#if files_'output' isn't set in derivative, use defualts for some
|
||||
[[ ${!v} ]] || {
|
||||
case $o in
|
||||
bin)
|
||||
v=SCATTER_BIN_DEFAULT
|
||||
;;
|
||||
doc)
|
||||
v=SCATTER_DOC_DEFAULT
|
||||
;;
|
||||
*)
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# prepend each path with $out
|
||||
paths=$out${!v// \// $out/}
|
||||
shopt -s nullglob
|
||||
for f in $paths; do
|
||||
shopt -u nullglob
|
||||
dist=${!o}${f#$out}
|
||||
mkdir -p $(dirname $dist)
|
||||
cp -pr $f $dist
|
||||
# remove source, not forgetting to clean empty dirs
|
||||
rm -r $f
|
||||
rmdir --ignore-fail-on-non-empty $(dirname $f)
|
||||
done
|
||||
find ${!o} -type f -exec $SHELL -c 'patchelf --set-rpath $(patchelf --print-rpath {} 2>/dev/null):'${!o}'/lib {} 2>/dev/null && patchelf --shrink-rpath {}' \;
|
||||
done
|
||||
eval $save_nullglob
|
||||
}
|
||||
|
||||
propagate_bin_input() {
|
||||
if [[ -n ${bin:-} ]]; then
|
||||
mkdir -p $out/nix-support
|
||||
echo $bin >> $out/nix-support/propagated-native-build-inputs
|
||||
fi
|
||||
|
||||
if [[ -n ${bin:-} && -n ${doc:-} ]]; then
|
||||
mkdir -p $bin/nix-support
|
||||
echo $doc >> $bin/nix-support/propagated-user-env-packages
|
||||
fi
|
||||
}
|
@ -156,8 +156,6 @@ in
|
||||
|
||||
dispad = callPackage ../tools/X11/dispad { };
|
||||
|
||||
scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
|
||||
|
||||
vsenv = callPackage ../build-support/vsenv {
|
||||
vs = vs90wrapper;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user