public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Skip flex on Mac OS X, use the right unzip. 

svn path=/nixpkgs/trunk/; revision=2446
This commit is contained in:
Eelco Dolstra 2005-03-23 15:50:11 +00:00
parent 160511bb5b
commit bf571aef78
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/system/all-packages-generic.nix
View File

@ -90,7 +90,10 @@ rec {
inherit fetchurl stdenv; 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; inherit fetchurl stdenv;
}; };

2
pkgs/system/populate-cache.nix
View File

@ -96,7 +96,7 @@ let {
aterm aterm
subversion subversion
bisonnew bisonnew
flexnew # flexnew
libxml2 libxml2
libxslt libxslt
docbook_xml_dtd_42 docbook_xml_dtd_42