From a233ebf8917fbc7e4052db2ebbc5b08b79674f09 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 7 Aug 2011 01:45:26 +0000 Subject: Switch to forward compatibility of kde45 on kde_baseapps. svn path=/nixpkgs/trunk/; revision=28217 --- pkgs/tools/misc/partition-manager/default.nix | 4 ++-- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index b45b1a0aa1fb..46be78965fbd 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kdelibs, kdebase, +{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kdelibs, kde_baseapps, automoc4, phonon, perl }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ cmake gettext parted libuuid qt4 kdelibs kdebase automoc4 perl phonon ]; + [ cmake gettext parted libuuid qt4 kdelibs kde_baseapps automoc4 perl phonon ]; preConfigure = '' export VERBOSE=1 diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 1568cc4bfde2..a474a036661b 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, gettext}: +{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, gettext, kde_baseapps }: stdenv.mkDerivation rec { name = "kdiff3-0.9.95"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; # kdebase allows having a konqueror plugin built - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext ]; + buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kde_baseapps ]; # Adjust the version of the DocBook XML to 4.2 ( so that it validates ). patches = [ ./adjust-docbook-xml-version-to-4.2.patch ]; -- cgit 1.4.1