diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-26 21:52:41 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-26 21:52:41 +0000 |
| commit | 6dfc121001334d1a635b693ce300f37dd7052dc2 (patch) | |
| tree | aa480bb90b09862f01ea656f3448327cbb3b5e28 /pkgs/system/all-packages-generic.nix | |
| parent | 3f5a0c251ad53f159667f7fb620d82fefe175382 (diff) | |
| download | nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.tar nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.tar.gz nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.tar.bz2 nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.tar.lz nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.tar.xz nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.tar.zst nixpkgs-6dfc121001334d1a635b693ce300f37dd7052dc2.zip | |
OOo2 needs a newer version of bison than we used before. Use 2.1 now.
svn path=/nixpkgs/trunk/; revision=4151
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 2231a6ea25b..d30dc1b7b4f 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1420,9 +1420,15 @@ rec { ### APPLICATIONS openoffice = (import ../applications/office/openoffice) { - inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon bison flex zip libmspack getopt; + inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon flex zip libmspack getopt; inherit (xlibs) libXaw fontconfig; inherit (gtkLibs) gtk; + + bison = (import ../development/tools/parsing/bison/bison-2.1.nix) { + inherit fetchurl stdenv; + m4 = gnum4; + }; + }; cvs = (import ../applications/version-management/cvs) { |