* More examples of interpolation.

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

7 files changed, 24 insertions, 40 deletions

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 718e089abcc..140a0b2e256 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
   configureFlags =
     [ "--enable-a4-paper" ] /* We obey ISO standards! */
     ++ (if enablePDFtoPPM then [
-      ("--with-freetype2-library=${freetype}/lib")
-      ("--with-freetype2-includes=${freetype}/include/freetype2")
+      "--with-freetype2-library=${freetype}/lib"
+      "--with-freetype2-includes=${freetype}/include/freetype2"
     ] else []);
 
 }
diff --git a/pkgs/development/tools/misc/kcachegrind/builder.sh b/pkgs/development/tools/misc/kcachegrind/builder.sh
deleted file mode 100644
index d39882b13c8..00000000000
--- a/pkgs/development/tools/misc/kcachegrind/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-
-export KDEDIR=$kdelibs
-
-configureFlags="\
-  --without-arts
-  --x-includes=$libX11/include \
-  --x-libraries=$libX11/lib \
-  "
-
-genericBuild
diff --git a/pkgs/development/tools/misc/kcachegrind/default.nix b/pkgs/development/tools/misc/kcachegrind/default.nix
index e527690b068..100d835a178 100644
--- a/pkgs/development/tools/misc/kcachegrind/default.nix
+++ b/pkgs/development/tools/misc/kcachegrind/default.nix
@@ -4,13 +4,18 @@
 
 stdenv.mkDerivation {
   name = "kcachegrind-0.4.6";
-  builder = ./builder.sh;
 
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/kcachegrind-0.4.6.tar.gz;
     md5 = "4ed60028dcefd6bf626635d5f2f50273";
   };
 
-  inherit libX11 kdelibs;
+  KDEDIR = kdelibs;
+
+  configureFlags = "
+    --without-arts
+    --x-includes=${libX11}/include
+    --x-libraries=${libX11}/lib";
+    
   buildInputs = [kdelibs libX11 libXext libSM zlib perl qt expat libpng libjpeg];
 }
diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh
deleted file mode 100644
index 6c7d4c42b83..00000000000
--- a/pkgs/tools/graphics/graphviz/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-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 \
-    "
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 1de8e9a9e8f..dc113f40f30 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -5,16 +5,19 @@ assert libpng != null && libjpeg != null && expat != null;
 stdenv.mkDerivation {
   name = "graphviz-2.4";
 
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/graphviz-2.4.tar.gz;
     md5 = "f1074d38a7eeb5e5b2ebfdb643aebf8a";
   };
 
   buildInputs = [x11 libpng libjpeg expat libXaw yacc libtool];
-  configureFlags = [
-    (if x11 == null then "--without-x" else "")
-  ];
-  
-  inherit libpng libjpeg expat;
+  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"
+    ]
+    ++ (if x11 == null then ["--without-x"] else []);
 }
diff --git a/pkgs/tools/typesetting/bibtex-tools/builder.sh b/pkgs/tools/typesetting/bibtex-tools/builder.sh
deleted file mode 100644
index bb7538e38af..00000000000
--- a/pkgs/tools/typesetting/bibtex-tools/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-aterm=$aterm --with-sdf=$sdf --with-strategoxt=$strategoxt --with-hevea=$hevea --with-latex=$tetex"
-genericBuild
diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix
index 71c4584402a..86e856a4d51 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -2,11 +2,15 @@
 
 stdenv.mkDerivation {
   name = "bibtex-tools-0.2pre13026";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/bibtex-tools-0.2pre13026.tar.gz;
     md5 = "2d8a5de7c53eb670307048eb3d14cdd6";
   };
-  inherit aterm tetex hevea sdf strategoxt;
+  configureFlags = "
+    --with-aterm=${aterm}
+    --with-sdf=${sdf}
+    --with-strategoxt=${strategoxt}
+    --with-hevea=${hevea}
+    --with-latex=${tetex}";
   buildInputs = [aterm sdf strategoxt hevea];
 }