Author: kkallio
Date: Sun Aug 7 01:45:26 2011
New Revision: 28217
URL: https://svn.nixos.org/websvn/nix/?rev=28217&sc=1
Log:
Switch to forward compatibility of kde45 on kde_baseapps.
Modified:
nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix
nixpkgs/trunk/pkgs/applications/networking/browsers/konq-plugins/default.nix
nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/tools/misc/partition-manager/default.nix
nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix Sun Aug 7
01:27:23 2011 (r28216)
+++ nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix Sun Aug 7
01:45:26 2011 (r28217)
@@ -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 @@
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";
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/konq-plugins/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/browsers/konq-plugins/default.nix
Sun Aug 7 01:27:23 2011 (r28216)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/konq-plugins/default.nix
Sun Aug 7 01:45:26 2011 (r28217)
@@ -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 @@
sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi";
};
- buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_baseapps gettext ];
patches = [ ./qt47.patch ];
Modified: nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
Sun Aug 7 01:27:23 2011 (r28216)
+++ nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
Sun Aug 7 01:45:26 2011 (r28217)
@@ -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";
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Sun Aug 7 01:27:23
2011 (r28216)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Sun Aug 7 01:45:26
2011 (r28217)
@@ -49,6 +49,9 @@
### BASE
kdebase = callPackage ./base { };
+ # Forward compatibility.
+ kde_baseapps = kdebase;
+
kdebase_workspace = callPackage ./base-workspace { };
kdebase_runtime = callPackage ./base-runtime { };
Modified: nixpkgs/trunk/pkgs/tools/misc/partition-manager/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/partition-manager/default.nix Sun Aug 7
01:27:23 2011 (r28216)
+++ nixpkgs/trunk/pkgs/tools/misc/partition-manager/default.nix Sun Aug 7
01:45:26 2011 (r28217)
@@ -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 @@
};
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
Modified: nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix Sun Aug 7 01:27:23
2011 (r28216)
+++ nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix Sun Aug 7 01:45:26
2011 (r28217)
@@ -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 @@
};
# 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 ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
