summary refs log tree commit diff
path: root/pkgs/system/all-packages-generic.nix
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2005-10-27 11:59:10 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2005-10-27 11:59:10 +0000
commit1d0c278cff73bf7f3f321d0d3898545ea155fb4d (patch)
treee49280935ac7da4d8c8596c69eb5e64584e36f21 /pkgs/system/all-packages-generic.nix
parentb257d4cd1dc6f20c61b0b58240e0923742185bf5 (diff)
downloadnixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.tar
nixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.tar.gz
nixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.tar.bz2
nixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.tar.lz
nixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.tar.xz
nixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.tar.zst
nixpkgs-1d0c278cff73bf7f3f321d0d3898545ea155fb4d.zip
OOo2 needs older neon
svn path=/nixpkgs/trunk/; revision=4156
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r--pkgs/system/all-packages-generic.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 195b7d33ec4..4ac3eb6411a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1420,7 +1420,7 @@ rec {
   ### APPLICATIONS
 
   openoffice = (import ../applications/office/openoffice) {
-    inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon flex zip libmspack getopt file;
+    inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile flex zip libmspack getopt file;
     inherit (xlibs) libXaw fontconfig;
     inherit (gtkLibs) gtk;
 
@@ -1429,6 +1429,9 @@ rec {
       m4 = gnum4;
     };
 
+    neon = (import ../development/libraries/neon/neon-0.24.7.nix) {
+      inherit fetchurl stdenv libxml2;
+    };
   };
 
   cvs = (import ../applications/version-management/cvs) {