From ff7acae84bb46c3c13ab4f9e95a054de01bc0344 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Sep 2003 15:07:50 +0000 Subject: [PATCH] * Added gqview to system * Enabled build of dotty/lefty in graphviz. svn path=/nixpkgs/trunk/; revision=383 --- pkgs/graphviz/graphviz-build.sh | 2 +- pkgs/graphviz/graphviz.fix | 1 + pkgs/system/system-template-everything.fix | 1 + pkgs/system/system.fix | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/graphviz/graphviz-build.sh b/pkgs/graphviz/graphviz-build.sh index dd1081d8000..74d026f3ee6 100755 --- a/pkgs/graphviz/graphviz-build.sh +++ b/pkgs/graphviz/graphviz-build.sh @@ -7,6 +7,6 @@ NIX_CFLAGS_COMPILE="-I$zlib/include -I$libpng/include -I$libjpeg/include -I$expa tar xvfz $src || exit 1 cd graphviz-* || exit 1 -./configure --prefix=$out --without-x || exit 1 +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 make || exit 1 make install || exit 1 diff --git a/pkgs/graphviz/graphviz.fix b/pkgs/graphviz/graphviz.fix index 274976538ed..b7a78891ba9 100644 --- a/pkgs/graphviz/graphviz.fix +++ b/pkgs/graphviz/graphviz.fix @@ -9,6 +9,7 @@ Package( ])) , ("stdenv", IncludeFix("stdenv/stdenv.fix")) + , ("x11", IncludeFix("xfree86/xfree86.fix")) , ("zlib", IncludeFix("zlib/zlib.fix")) , ("libpng", IncludeFix("libpng/libpng.fix")) , ("libjpeg", IncludeFix("libjpeg/libjpeg.fix")) diff --git a/pkgs/system/system-template-everything.fix b/pkgs/system/system-template-everything.fix index 084ea2cd1db..13ad61f370f 100644 --- a/pkgs/system/system-template-everything.fix +++ b/pkgs/system/system-template-everything.fix @@ -10,4 +10,5 @@ Call(IncludeFix("system/system.fix"), , ("httpd", True) , ("firebird", True) , ("graphviz", True) + , ("gqview", True) ]) diff --git a/pkgs/system/system.fix b/pkgs/system/system.fix index b8d89c1e339..f53db5e469d 100644 --- a/pkgs/system/system.fix +++ b/pkgs/system/system.fix @@ -1,6 +1,6 @@ Function( [ "subversion", "strategoxt", "pan", "mplayer", "sylpheed", "libxslt", "libxml" - , "docbook", "httpd", "firebird", "graphviz" + , "docbook", "httpd", "firebird", "graphviz", "gqview" ], Package( [ ("name", "system") @@ -28,6 +28,7 @@ Function( , ("actHttpd", If(Var("httpd"), IncludeFix("httpd/httpd.fix"), "")) , ("actFirebird", If(Var("firebird"), IncludeFix("firebird/firebird.fix"), "")) , ("actGraphviz", If(Var("graphviz"), IncludeFix("graphviz/graphviz.fix"), "")) + , ("actGQView", If(Var("gqview"), IncludeFix("gqview/gqview.fix"), "")) ] ) )