Use fetchurl_gnome in dia

+small style changes (though almost all string changed)

svn path=/nixpkgs/trunk/; revision=29389

1 files changed, 21 insertions, 11 deletions

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 3f70f5d6038..533e196cee4 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,19 +1,29 @@
-{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }:
-stdenv.mkDerivation {
-  name = "dia-0.97";
+{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
+, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
+, withGNOME ? false, libgnomeui }:
 
-  src = fetchurl {
-    url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2;
-    sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
+stdenv.mkDerivation rec {
+  inherit (src) name;
+
+  src = fetchurl_gnome {
+    project = "dia";
+    major = "0"; minor = "97"; patchlevel = "1";
+    sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld";
   };
 
-  buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl intltool];
+  buildInputs =
+    [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5
+      libxslt docbook_xsl libart_lgpl
+    ] ++ stdenv.lib.optional withGNOME libgnomeui;
+
+  buildNativeInputs = [ pkgconfig intltool perl ];
+
+  configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
 
   meta = {
-    description = "Gnome Diagram drawing software.";
+    description = "Gnome Diagram drawing software";
     homepage = http://live.gnome.org/Dia;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms;
-      linux;
+    maintainers = with stdenv.lib.maintainers; [raskin urkud];
+    platforms = stdenv.lib.platforms.linux;
   };
 }