X.Org builder: always autoPropagate buildInputs
svn path=/nixpkgs/branches/stdenv-updates/; revision=9823
This commit is contained in:
parent
c116932a7e
commit
95f5f51bae
@ -4,11 +4,13 @@ source $stdenv/setup
|
|||||||
|
|
||||||
# After installation, automatically add all "Requires" fields in the
|
# After installation, automatically add all "Requires" fields in the
|
||||||
# pkgconfig files (*.pc) to the propagated build inputs.
|
# pkgconfig files (*.pc) to the propagated build inputs.
|
||||||
origPostInstall=$postInstall
|
if test -n "$postInstall"; then
|
||||||
postInstall=postInstall
|
postInstall="$postInstall; autoPropagateBuildInputs"
|
||||||
postInstall() {
|
else
|
||||||
if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
|
postInstall=autoPropagateBuildInputs
|
||||||
|
fi
|
||||||
|
|
||||||
|
autoPropagateBuildInputs() {
|
||||||
local r p requires
|
local r p requires
|
||||||
requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
|
requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
|
||||||
sed "s/Requires://" | sed "s/,/ /g")
|
sed "s/Requires://" | sed "s/,/ /g")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user