diff options
author | Wouter den Breejen <uu@denbreejen.net> | 2007-07-19 10:32:09 +0000 |
---|---|---|
committer | Wouter den Breejen <uu@denbreejen.net> | 2007-07-19 10:32:09 +0000 |
commit | 7ef356ace988f080324aaef20ae3dc50626858db (patch) | |
tree | 82b367709e649c6c7eb65864674d19786f8b0a56 /pkgs/top-level | |
parent | 6296d1a64f2b7536c526928ad150e1e250e528f5 (diff) | |
download | nixlib-7ef356ace988f080324aaef20ae3dc50626858db.tar nixlib-7ef356ace988f080324aaef20ae3dc50626858db.tar.gz nixlib-7ef356ace988f080324aaef20ae3dc50626858db.tar.bz2 nixlib-7ef356ace988f080324aaef20ae3dc50626858db.tar.lz nixlib-7ef356ace988f080324aaef20ae3dc50626858db.tar.xz nixlib-7ef356ace988f080324aaef20ae3dc50626858db.tar.zst nixlib-7ef356ace988f080324aaef20ae3dc50626858db.zip |
Removed duplicate stdenv in OO.org
svn path=/nixpkgs/trunk/; revision=9002
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f730a713a4c..286e483a7aea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3042,7 +3042,7 @@ rec { }; openoffice = import ../applications/office/openoffice { - inherit fetchurl stdenv pam python tcsh libxslt + inherit fetchurl pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron curl libsndfile flex zip unzip libmspack @@ -3053,7 +3053,7 @@ rec { inherit jre; stdenv = overrideGCC stdenv gcc34; }; - + opera = import ../applications/networking/browsers/opera { inherit fetchurl stdenv zlib; inherit (xlibs) libX11 libSM libICE libXt libXext; |