From d784268531f08db34a364a38f04e3b207f84483a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 31 Mar 2008 21:41:18 +0000
Subject: [PATCH] abiword 2.6.0
svn path=/nixpkgs/trunk/; revision=11398
---
pkgs/applications/office/abiword/builder.sh | 9 ---------
pkgs/applications/office/abiword/default.nix | 12 ++++++------
pkgs/top-level/all-packages.nix | 2 +-
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 100644 pkgs/applications/office/abiword/builder.sh
diff --git a/pkgs/applications/office/abiword/builder.sh b/pkgs/applications/office/abiword/builder.sh
deleted file mode 100644
index aa9955d6e37..00000000000
--- a/pkgs/applications/office/abiword/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
- cd abi
-}
-
-preConfigure=preConfigure
-
-genericBuild
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 76ae26b8b36..ae06a5e4835 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,16 +1,16 @@
{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomeprint,
-libgnomeprintui, libgnomecanvas, fribidi, libpng, popt
+libgnomeprintui, libgnomecanvas, fribidi, libpng, popt, libgsf,
+enchant, wv
}:
stdenv.mkDerivation {
- name = "abiword-2.4.6";
- builder = ./builder.sh;
+ name = "abiword-2.6.0";
src = fetchurl {
- url = http://www.abisource.com/downloads/abiword/2.4.6/source/abiword-2.4.6.tar.gz;
- sha256 = "1lzyl9nd545jga1hh5c67kdqajp60i5xc67wvg6jcgzkn41my44q";
+ url = http://www.abisource.com/downloads/abiword/2.6.0/source/abiword-2.6.0.tar.gz;
+ sha256 = "1fzhfk3bbv65bj9rifhzki57mpsvz4mw89ic3jl0d1zdgg8cxc9m";
};
buildInputs = [pkgconfig gtk libglade libgnomeprint libgnomeprintui
- libgnomecanvas fribidi libpng popt
+ libgnomecanvas fribidi libpng popt libgsf enchant wv
];
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 337bf80bf2f..221ff5748bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4674,7 +4674,7 @@ let pkgs = rec {
};
abiword = import ../applications/office/abiword {
- inherit fetchurl stdenv pkgconfig fribidi libpng popt;
+ inherit fetchurl stdenv pkgconfig fribidi libpng popt libgsf enchant wv;
inherit (gtkLibs) gtk;
inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
};