b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch to forward compatibility of kde45 on kde_baseapps.

Browse source 
svn path=/nixpkgs/trunk/; revision=28217
This commit is contained in:
Karn Kallio 2011-08-07 01:45:26 +00:00
parent 875b65ca0e
commit a233ebf891
6 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/krusader/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kdebase, automoc4, phonon}:
{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4, phonon}:
stdenv.mkDerivation rec {
name = "krusader-2.2.0-beta1";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/krusader/${name}.tar.bz2";
sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs";
};
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kdebase ];
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps ];
meta = {
description = "Norton/Total Commander clone for KDE";
license = "GPL";

4
pkgs/applications/networking/browsers/konq-plugins/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase, gettext }:
{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kde_baseapps, gettext }:
stdenv.mkDerivation rec {
name = "konq-plugins-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi";
};
buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ];
buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_baseapps gettext ];
patches = [ ./qt47.patch ];

2
pkgs/applications/version-management/kdesvn/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4
, kdelibs, automoc4, phonon, kdebase}:
, kdelibs, automoc4, phonon, kde_baseapps }:
stdenv.mkDerivation {
name = "kdesvn-1.5.5";

3
pkgs/desktops/kde-4.5/default.nix
View file

@ -49,6 +49,9 @@ recurseIntoAttrs rec {
### BASE
kdebase = callPackage ./base { };
# Forward compatibility.
kde_baseapps = kdebase;
kdebase_workspace = callPackage ./base-workspace { };
kdebase_runtime = callPackage ./base-runtime { };

4
pkgs/tools/misc/partition-manager/default.nix
View file

@ -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

4
pkgs/tools/text/kdiff3/default.nix
View file

@ -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 ];