Builder fixes

svn path=/nixpkgs/trunk/; revision=4266
This commit is contained in:
Martin Bravenboer 2005-11-12 17:44:40 +00:00
parent d7cd4fbb08
commit f4b63fcae8
2 changed files with 10 additions and 3 deletions

View File

@ -1,11 +1,16 @@
{stdenv, fetchurl, kdelibs}: # todo: make libXext a propaged build input in kdelibs?
{stdenv, fetchurl, kdelibs, libX11, libXext, qt, zlib, perl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kcachegrind-0.4.6"; name = "kcachegrind-0.4.6";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://kcachegrind.sourceforge.net/kcachegrind-0.4.6.tar.gz; url = http://kcachegrind.sourceforge.net/kcachegrind-0.4.6.tar.gz;
md5 = "4ed60028dcefd6bf626635d5f2f50273"; md5 = "4ed60028dcefd6bf626635d5f2f50273";
}; };
buildInputs = [kdelibs]; inherit libX11 kdelibs;
buildInputs = [kdelibs libX11 libXext zlib perl qt];
} }

View File

@ -381,7 +381,9 @@ rec {
}; };
kcachegrind = (import ../development/tools/misc/kcachegrind) { kcachegrind = (import ../development/tools/misc/kcachegrind) {
inherit fetchurl stdenv kdelibs; inherit fetchurl stdenv kdelibs zlib perl;
inherit (xlibs) libX11 libXext;
qt = qt3;
}; };
texinfo = (import ../development/tools/misc/texinfo) { texinfo = (import ../development/tools/misc/texinfo) {