From 9bf61690e8b0d14a9185b1ce8b046cafd2ae6749 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Jul 2011 15:33:41 +0000 Subject: [PATCH] * Added kde-baseapps and Gwenview. svn path=/nixpkgs/branches/kde-4.7/; revision=27726 --- pkgs/desktops/kde-4.7/baseapps.nix | 17 +++++++++++++++++ pkgs/desktops/kde-4.7/default.nix | 4 ++++ pkgs/desktops/kde-4.7/gwenview.nix | 16 ++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/desktops/kde-4.7/baseapps.nix create mode 100644 pkgs/desktops/kde-4.7/gwenview.nix diff --git a/pkgs/desktops/kde-4.7/baseapps.nix b/pkgs/desktops/kde-4.7/baseapps.nix new file mode 100644 index 00000000000..e32b1f6fcc2 --- /dev/null +++ b/pkgs/desktops/kde-4.7/baseapps.nix @@ -0,0 +1,17 @@ +{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano +, shared_desktop_ontologies, glib +}: + +kde.package { + + buildInputs = + [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies + glib + ]; + + meta = { + description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; + license = "GPLv2"; + kde.name = "kde-baseapps"; + }; +} diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 1014bb8f1ab..3f8e3ac50eb 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -47,8 +47,12 @@ recurseIntoAttrs rec { kdebase_runtime = callPackage ./base-runtime { }; + kde_baseapps = callPackage ./baseapps.nix { }; + ### OTHER MODULES + gwenview = callPackage ./gwenview.nix { }; + okular = callPackage ./okular.nix { }; konsole = callPackage ./konsole.nix { }; diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix new file mode 100644 index 00000000000..a1cab46f798 --- /dev/null +++ b/pkgs/desktops/kde-4.7/gwenview.nix @@ -0,0 +1,16 @@ +{ kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano +, shared_desktop_ontologies, kde_baseapps }: + +kde.package { + + buildInputs = + [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies + kde_baseapps + ]; + + meta = { + description = "Gwenview, the KDE image viewer"; + license = "GPLv2"; + kde.name = "gwenview"; + }; +}