ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Use fetchurl_gnome in dia

Browse Source 
+small style changes (though almost all string changed)

svn path=/nixpkgs/trunk/; revision=29389
This commit is contained in:
Yury G. Kudryashov 2011-09-20 06:31:37 +00:00
parent 31d77b3e2f
commit 87b968e858
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/graphics/dia/default.nix
View File

@ -1,19 +1,29 @@
{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }: {stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
stdenv.mkDerivation { , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
name = "dia-0.97"; , withGNOME ? false, libgnomeui }:
src = fetchurl { stdenv.mkDerivation rec {
url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2; inherit (src) name;
sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
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 = { meta = {
description = "Gnome Diagram drawing software."; description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia; homepage = http://live.gnome.org/Dia;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = with stdenv.lib.maintainers; [raskin urkud];
platforms = with stdenv.lib.platforms; platforms = stdenv.lib.platforms.linux;
linux;
}; };
} }

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

@ -6310,7 +6310,9 @@ let
inherit (xlibs) libxcb pixman libpthreadstubs libXau; inherit (xlibs) libxcb pixman libpthreadstubs libXau;
}; };
dia = callPackage ../applications/graphics/dia { }; dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome) libart_lgpl libgnomeui;
};
djvulibre = callPackage ../applications/misc/djvulibre { }; djvulibre = callPackage ../applications/misc/djvulibre { };