Author: eelco
Date: Mon Sep 12 12:45:59 2011
New Revision: 29206
URL: https://ssl.nixos.org/websvn/nix/?rev=29206&sc=1
Log:
* 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?
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Sep 12 12:40:58
2011 (r29205)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Sep 12 12:45:59
2011 (r29206)
@@ -49,11 +49,6 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
