* Skip flex on Mac OS X, use the right unzip.
svn path=/nixpkgs/trunk/; revision=2446
This commit is contained in:
parent
160511bb5b
commit
bf571aef78
@ -90,7 +90,10 @@ rec {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
unzip = (import ../tools/archivers/unzip) {
|
||||
# !!! fix this
|
||||
unzip = if stdenv.system == "i686-linux" then unzip550 else unzip552;
|
||||
|
||||
unzip550 = (import ../tools/archivers/unzip) {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
|
@ -96,7 +96,7 @@ let {
|
||||
aterm
|
||||
subversion
|
||||
bisonnew
|
||||
flexnew
|
||||
# flexnew
|
||||
libxml2
|
||||
libxslt
|
||||
docbook_xml_dtd_42
|
||||
|
Loading…
Reference in New Issue
Block a user