Author: raskin Date: 2010-07-05 19:04:33 +0000 (Mon, 05 Jul 2010) New Revision: 22483
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22483&view=rev Added: nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Readding old Graphviz: I need it for some graph program that relies on its way of grid snapping. Changes: Copied: nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix (from rev 22477, nixpkgs/trunk/pkgs/tools/graphics/graphviz/default.nix) =================================================================== --- nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix (rev 0) +++ nixpkgs/trunk/pkgs/tools/graphics/graphviz/2.0.nix 2010-07-05 19:04:33 UTC (rev 22483) @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw +, yacc, libtool, fontconfig, pango, gd +}: + +assert libpng != null && libjpeg != null && expat != null; + +stdenv.mkDerivation rec { + name = "graphviz-2.0"; + + src = fetchurl { + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";; + sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; + }; + + buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + + configureFlags = + [ "--with-pngincludedir=${libpng}/include" + "--with-pnglibdir=${libpng}/lib" + "--with-jpegincludedir=${libjpeg}/include" + "--with-jpeglibdir=${libjpeg}/lib" + "--with-expatincludedir=${expat}/include" + "--with-expatlibdir=${expat}/lib" + ] + ++ stdenv.lib.optional (x11 == null) "--without-x"; + + meta = { + description = "A program for visualising graphs"; + homepage = http://www.graphviz.org/; + }; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-05 16:55:54 UTC (rev 22482) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-05 19:04:33 UTC (rev 22483) @@ -890,6 +890,17 @@ inherit (gtkLibs) pango; }; + /* Readded by Michael Raskin. There are programs in the wild + * that do want 2.0 but not 2.22. Please give a day's notice for + * objections before removal. + */ + graphviz_2_0 = import ../tools/graphics/graphviz/2.0.nix { + inherit fetchurl stdenv pkgconfig libpng libjpeg expat x11 yacc + libtool fontconfig gd; + inherit (xlibs) libXaw; + inherit (gtkLibs) pango; + }; + groff = import ../tools/text/groff { inherit fetchurl stdenv perl; ghostscript = null; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
