* More examples of interpolation.

svn path=/nixpkgs/trunk/; revision=5244
2006-05-01 15:25:17 +00:00
parent d56e3d6f5a
commit 4acfb1a684
7 changed files with 24 additions and 40 deletions
--- a/pkgs/development/tools/misc/kcachegrind/builder.sh
+++ b/pkgs/development/tools/misc/kcachegrind/builder.sh
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-
-export KDEDIR=$kdelibs
-
-configureFlags="\
-  --without-arts
-  --x-includes=$libX11/include \
-  --x-libraries=$libX11/lib \
-  "
-
-genericBuild
--- 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];
 }