From 7ef356ace988f080324aaef20ae3dc50626858db Mon Sep 17 00:00:00 2001 From: Wouter den Breejen Date: Thu, 19 Jul 2007 10:32:09 +0000 Subject: [PATCH] Removed duplicate stdenv in OO.org svn path=/nixpkgs/trunk/; revision=9002 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f730a713a4..286e483a7ae 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;