diff options
| author | Wouter den Breejen <uu@denbreejen.net> | 2007-07-18 16:46:46 +0000 |
|---|---|---|
| committer | Wouter den Breejen <uu@denbreejen.net> | 2007-07-18 16:46:46 +0000 |
| commit | a268963eec4e10f6d4d2da55a9cd0fdf31553d9b (patch) | |
| tree | 9ca67d31ab51930bc3dd13be12b5cfc79a416680 /pkgs/top-level | |
| parent | 860a5d0b70e4b8fa725226bd854c91af9df204a2 (diff) | |
| download | nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.tar nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.tar.gz nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.tar.bz2 nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.tar.lz nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.tar.xz nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.tar.zst nixlib-a268963eec4e10f6d4d2da55a9cd0fdf31553d9b.zip | |
Worked on openoffice
svn path=/nixpkgs/trunk/; revision=8999
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 294d1b460ef9..8f730a713a4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3049,10 +3049,11 @@ rec { getopt file neon; inherit (xlibs) libXaw; inherit (gtkLibs) gtk; - bison = bison23; + inherit jre; + stdenv = overrideGCC stdenv gcc34; }; - + opera = import ../applications/networking/browsers/opera { inherit fetchurl stdenv zlib; inherit (xlibs) libX11 libSM libICE libXt libXext; |