From 4a0e45a8593879b013b4a1e9a08fc1a8f8528c20 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 29 Sep 2009 15:36:33 +0000 Subject: [PATCH] A missing OO.o dependency located.. Why does not configure check for it in the very beginning.. svn path=/nixpkgs/trunk/; revision=17511 --- pkgs/applications/office/openoffice/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 06d2112ff13..07a7392e6d1 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -3,7 +3,7 @@ , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , 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 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6e1fa509ed..6e74fed1de8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7240,7 +7240,7 @@ let inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (gtkLibs) gtk; inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome26) GConf; + inherit (gnome26) GConf ORBit2; }; opera = import ../applications/networking/browsers/opera {