dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

A missing OO.o dependency located.. Why does not configure check for it in the very beginning..

Browse Source 
svn path=/nixpkgs/trunk/; revision=17511
This commit is contained in:
Michael Raskin 2009-09-29 15:36:33 +00:00
parent 3872882e93
commit 4a0e45a859
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/openoffice/default.nix
View File

@ -3,7 +3,7 @@
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
}: }:
let version = "3.1.1"; in let version = "3.1.1"; in
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
cups libXinerama openssl gperf GConf cups libXinerama openssl gperf GConf ORBit2
]; ];
inherit icu fontconfig libjpeg jdk cups; inherit icu fontconfig libjpeg jdk cups;

2
pkgs/top-level/all-packages.nix
View File

@ -7240,7 +7240,7 @@ let
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome26) GConf; inherit (gnome26) GConf ORBit2;
}; };
opera = import ../applications/networking/browsers/opera { opera = import ../applications/networking/browsers/opera {