* Added gqview to system

* Enabled build of dotty/lefty in graphviz.

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

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

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"))

pkgs/system/system-template-everything.fix

@@ -10,4 +10,5 @@ Call(IncludeFix("system/system.fix"),
   , ("httpd", True)
   , ("firebird", True)
   , ("graphviz", True)
+  , ("gqview", True)
   ])

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"), ""))
     ]
   )
 )