From 74e4d96e7e85539a8b075518678543f68b76b906 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 12:45:59 +0000 Subject: [PATCH] * Remove the kde_baseapps wrapper because 1) It broke the Gwenview build (it ended up depending on the wrapper). 2) It's confusing to have two identically named packages. 3) If upstream's kde_baseapps doesn't include Konsole and Kate, then why should ours? svn path=/nixpkgs/trunk/; revision=29206 --- pkgs/desktops/kde-4.7/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 5b677dd13d4..9d6981f1168 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -49,11 +49,6 @@ kde.modules // kde.individual // kdebase_workspace = kde.modules.kde_workspace; - kde_baseapps = kde.modules.kde_baseapps // { - inherit (kde.individual) kate konsole; - propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ]; - }; - inherit release; full = stdenv.lib.attrValues kde.modules;