* Flex required M4 at runtime.
svn path=/nixpkgs/trunk/; revision=734
This commit is contained in:
parent
9249f4c892
commit
3f6bf521fc
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
export buildinputs="$yacc"
|
export buildinputs="$yacc $m4"
|
||||||
. $stdenv/setup || exit 1
|
. $stdenv/setup || exit 1
|
||||||
|
|
||||||
tar xvfj $src || exit 1
|
tar xvfj $src || exit 1
|
||||||
@ -8,3 +8,5 @@ cd flex-* || exit 1
|
|||||||
./configure --prefix=$out || exit 1
|
./configure --prefix=$out || exit 1
|
||||||
make || exit 1
|
make || exit 1
|
||||||
make install || exit 1
|
make install || exit 1
|
||||||
|
|
||||||
|
echo "$m4" > $out/propagated-build-inputs || exit 1
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# !!! this should be moved to default.nix eventually (but I delay
|
# !!! this should be moved to default.nix eventually (but I delay
|
||||||
# doing that since it would cause a rebuild of lots of stuff).
|
# doing that since it would cause a rebuild of lots of stuff).
|
||||||
|
|
||||||
{stdenv, fetchurl, yacc}:
|
{stdenv, fetchurl, yacc, m4}:
|
||||||
|
|
||||||
assert !isNull yacc;
|
assert !isNull yacc;
|
||||||
|
|
||||||
@ -15,4 +15,5 @@ derivation {
|
|||||||
};
|
};
|
||||||
stdenv = stdenv;
|
stdenv = stdenv;
|
||||||
yacc = yacc;
|
yacc = yacc;
|
||||||
|
m4 = m4;
|
||||||
}
|
}
|
||||||
|
@ -219,6 +219,7 @@
|
|||||||
fetchurl = fetchurl;
|
fetchurl = fetchurl;
|
||||||
stdenv = stdenv;
|
stdenv = stdenv;
|
||||||
yacc = bison;
|
yacc = bison;
|
||||||
|
m4 = gnum4;
|
||||||
};
|
};
|
||||||
|
|
||||||
gcc = (import ../development/compilers/gcc) {
|
gcc = (import ../development/compilers/gcc) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user