diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 3b991cb2ef7..e0801d80ba7 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -1,8 +1,12 @@ -callPackage : +{ callPackage, stdenv, fetchurl } : { recurseForRelease = true; + kdePackage = import ./kde-package { + inherit stdenv fetchurl; + }; + ### SUPPORT akonadi = callPackage ./support/akonadi { }; diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix new file mode 100644 index 00000000000..614c31561fd --- /dev/null +++ b/pkgs/desktops/kde-4.5/kde-package/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +{ pn, v, stable ? true, sha256 }: args: +stdenv.mkDerivation ({ + name = "${pn}-${v}"; + src = fetchurl { + url = "mirror://kde/" + (if stable then "" else "un") + + "stable/${v}/src/${pn}-${v}.tar.bz2"; + inherit sha256; + }; + meta = { + maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + platforms = stdenv.lib.platforms.linux; + inherit stable; + homepage = http://www.kde.org; + } // ( if args ? meta then args.meta else { } ); +} // args) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a709049231..4d9a7770f4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6542,13 +6542,15 @@ let stdenv = stdenv2; }); - kde45 = import ../desktops/kde-4.5 (newScope ({ - qt4 = qt47; - pyqt4 = pyqt4.override { qt4 = qt47; }; - libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; }; - shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; }; - stdenv = stdenv2; - } // kde45) ); + kde45 = callPackage ../desktops/kde-4.5 { + callPackage = newScope ({ + qt4 = qt47; + pyqt4 = pyqt4.override { qt4 = qt47; }; + libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; }; + shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; }; + stdenv = stdenv2; + } // kde45); + }; xfce = xfce4; xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);