mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 22:03:54 +03:00
Removed duplicate stdenv in OO.org
svn path=/nixpkgs/trunk/; revision=9002
This commit is contained in:
parent
6296d1a64f
commit
7ef356ace9
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user