From a07c80b6d9a70d4ed7b9e68b6e5ac502f19406ab Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sat, 12 Nov 2005 21:33:39 +0000 Subject: [PATCH] kcachegrind svn path=/nixpkgs/trunk/; revision=4273 --- pkgs/development/tools/misc/kcachegrind/default.nix | 6 ++---- pkgs/system/all-packages-generic.nix | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/kcachegrind/default.nix b/pkgs/development/tools/misc/kcachegrind/default.nix index 0a6bc40de49..63ba8391483 100644 --- a/pkgs/development/tools/misc/kcachegrind/default.nix +++ b/pkgs/development/tools/misc/kcachegrind/default.nix @@ -1,6 +1,4 @@ -# todo: make libXext a propaged build input in kdelibs? - -{stdenv, fetchurl, kdelibs, libX11, libXext, qt, zlib, perl}: +{stdenv, fetchurl, kdelibs, libX11, libXext, libSM, libpng, libjpeg, qt, zlib, perl, expat}: stdenv.mkDerivation { name = "kcachegrind-0.4.6"; @@ -12,5 +10,5 @@ stdenv.mkDerivation { }; inherit libX11 kdelibs; - buildInputs = [kdelibs libX11 libXext zlib perl qt]; + buildInputs = [kdelibs libX11 libXext libSM zlib perl qt expat libpng libjpeg]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 9bcbcbac3d4..511fa33cadf 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -381,8 +381,8 @@ rec { }; kcachegrind = (import ../development/tools/misc/kcachegrind) { - inherit fetchurl stdenv kdelibs zlib perl; - inherit (xlibs) libX11 libXext; + inherit fetchurl stdenv kdelibs zlib perl expat libpng libjpeg; + inherit (xlibs) libX11 libXext libSM; qt = qt3; };