10 files changed, 587 insertions, 578 deletions
diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
index d8bbdd8607561..fd0cc516b1372 100644
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt48 }:
 
 let
-  release = "4.7.97";
+  release = "4.8.0";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
diff --git a/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch
new file mode 100644
index 0000000000000..378cdb6469400
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3e247..f78db67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++project(kde-wallpapers NONE)
++if( WALLPAPER_INSTALL_DIR )
++  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
++else()
++  find_package(KDE4 REQUIRED)
++  include(KDE4Defaults)
++endif()
+ 
+ install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+ 
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
deleted file mode 100644
index b833ba6fc405e..0000000000000
--- a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
+++ /dev/null
@@ -1,300 +0,0 @@
-{stable=false;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="1xxhzqdcjinxyh9w24bn77qnxxp85rb7c50ad7ssb0wv4x9n62k9";}
-  {name="ark";value="0wagf0nws8mslz12gj38bp4rckw67qgfljigmiwlbq8nd1xl8j7g";}
-  {name="blinken";value="1w6jrmnaq04pnfvqmi7jwcanag0rrj7n3zlcmv1sp0lw4wp1ymwi";}
-  {name="cantor";value="088b2aj4bp8w8vk02v9sbm5mpfhvgbnw8pjdcn2gm3m14s93w0h5";}
-  {name="filelight";value="16y7v1m4ypjmlbih05i0r3k0s9av77jxq3v9g6vq6ikh98m9fcgf";}
-  {name="gwenview";value="05hxanwh7irj15riix8z2j50p295y73qaxgr82km093k9a0d1fkp";}
-  {name="jovie";value="1sv6aiy8d2ks1dbad5wjrq1w8vza87b09fqaspkkcbi0r1kdh4za";}
-  {name="kaccessible";value="1cr1b9fmf5qmh640q5h0h8phz9rrmqszrwhwrfzsmd7nxsl1y27v";}
-  {name="kactivities";value="0gyprn0mrh3swfjaxmvrbgyj81jx4qp8c0r8ym6dl1fsxri3p92a";}
-  {name="kalgebra";value="0fy6bimaycrbj5wy0422iybxw29cc0jl0683rx7r90vdyaf85jdp";}
-  {name="kalzium";value="149mmwz37akr3dzpin8s6hyyvp9dk5m3ijax80nc4z7sf7ciipqk";}
-  {name="kamera";value="1y6vykyvzmlm4zikcd74qjirqmygj0w6h1ra8whcgp3mwzfbybhq";}
-  {name="kanagram";value="18ccq0bpqj0kk7b36i1bxywcw6jpa6g136kd8lpd6ppy8fn9mfb0";}
-  {name="kate";value="13iwdhsghn7n80vl8cvsx3095algw9z8q1pcabcfiwkffkzdpcd2";}
-  {name="kbruch";value="178vc3nbqwbprw7ksdnbxxp1kibp74a8wmdkp6avhl9l694fwlyb";}
-  {name="kcalc";value="1llr012q5li9da1d4dlx0fsi1bvbl3w65213i78c5pwrq9w4l5cn";}
-  {name="kcharselect";value="14mw7rc0ghd1g7s40v7irkwmfs0k8xqhwka1s33k8y7lnan5gic7";}
-  {name="kcolorchooser";value="1x8c71d4vq8wl693wkjlbbalzn2nfa2rkimblyvv8779193bpvng";}
-  {name="kdeadmin";value="0h1bmrd6yz7qnpi2b76mqjdbrvchmb7wsw5a04pgs2cii0fgzpw1";}
-  {name="kdeartwork";value="01v1cmlscr4nixphad8j09xf6vh99y8924cf0x0vazxrqg23b792";}
-  {name="kde-baseapps";value="17g902kswan3qcfaig1zb2xdip59z9p199zingc4wjm3sr2bjd6j";}
-  {name="kde-base-artwork";value="1rxfrcq5c70dvrgisn5zd8lnj3q36ic5w6lp25yd23zyb89ybdff";}
-  {name="kdegames";value="0r3sijgsb40b9jp4imrx50l1pn8yxv7qkj80pyz3ad0q73hn7lyr";}
-  {name="kdegraphics-strigi-analyzer";value="1zw679b3s24aa2q771d1qxm70v081b7wasv9p4cla2a6kkicfzxq";}
-  {name="kdegraphics-thumbnailers";value="1xwnk1fkmysfz1kidabb72cafn15nr36yazpb4na1byzvwdyzlwy";}
-  {name="kdelibs";value="1mf29b8vyp9h9pi0bm17hkmscnmq1if14p9p18prc3ssnvyljjy3";}
-  {name="kdemultimedia";value="1115xgm197wx8m7cqmwsfaq8plrs6ksvrb7bsxqcghslsd9af9m2";}
-  {name="kdenetwork";value="0fhclhwpw8kjvzb577bl6hhcpa9i4qlyxhkflifslkfq1015h3r3";}
-  {name="kdepim";value="19hcv3plzypnivi7ki9h477l152y5hhk0zr03gas9xggwl8hyw0w";}
-  {name="kdepimlibs";value="0c05vjld2hbg08cnjqdc3cbwviakhxc6f9qlxlqh2yy8idmd3gkq";}
-  {name="kdepim-runtime";value="05c9siwb5gv0b1dsqfabalmgkpgklly6bxlfvk9gl9v9dxnsjlb4";}
-  {name="kdeplasma-addons";value="056bkr7794kv5qy51l3cip1xp69h67ps4m47g9scykr8qsknvkjy";}
-  {name="kde-runtime";value="1g04wvjsnqxr187mv59hb2f1hsfyh7x8qyypqhc0r09b9z8ri41q";}
-  {name="kdesdk";value="0cn4hlxfmk9rfy1n2m064wcgjlxfx1lrfvkw0dwvfabyhqipcidi";}
-  {name="kdetoys";value="043wqxqsj36c0nwsl1qlzkdpkxn2q0pf9mgj35zrmzn9kvsrfxc7";}
-  {name="kde-wallpapers";value="1i2l5h0z3bj5kfagdvzi0f1rrv4a1yq0kn23ggdvv6gi1gj5mbrp";}
-  {name="kdewebdev";value="0wycx5m9ir7k0nrl8jyir0c1cai6wg4i07ffrvwg0mwv083v562q";}
-  {name="kde-workspace";value="058rm45cxj28m5z6afih9v4f5ingj9nhq4ab0ccs2gpk7arphdyr";}
-  {name="kdf";value="0fx2basl17qlx2a8mmlk7hcdvb8vg2pnqazgxf0fpy0m8kn3f9c0";}
-  {name="kfloppy";value="0617i1c64lyxkj2zl3p0m9wgb1c1ay43miiyapfbw5sbqnjclrpl";}
-  {name="kgamma";value="17zhsr0q75q48qn46gg8j2ddpggcg8r2xz7r2rd94w3nkvb61lar";}
-  {name="kgeography";value="13gbpkpiwlp5ccb4nslskgs6gdyg2gy1qn35xwjzg7dh5yy4knwz";}
-  {name="kgpg";value="0yrqvhw3k9r2mpximk3fg5qng6hsr2n6ahy48cl8a27rrjy9awnd";}
-  {name="khangman";value="0gbdj78bdh2m7sfbj0x8vzi13mnad6fv3ymdk80xlll34vrd0jpr";}
-  {name="kig";value="0ypb4vvc4igjl1j7krzp6q7rdd7b4459aa4px6d8ajlyq3g8xv94";}
-  {name="kimono";value="1a31n5gr05z546f7rjhcykgpp6nkz6j13s83h9ag8m9xf7nrqbcf";}
-  {name="kiten";value="0c0s6haqhwgmj2lc2qjsirjfsbpkffs1v7dgampjy1zkf4harass";}
-  {name="klettres";value="04w23p53kdqkp455795pgghw05njarkdsd0rnb5j6cvf1bgasycn";}
-  {name="kmag";value="037fcpflw1rf6084qxp6ipfrbqqr7a3sd746mhmhbvmmdia0s0df";}
-  {name="kmousetool";value="0fbms2sqz60p4vnjzplmnw6fkizpzky5vcdm3x3l66ijfsagnwzh";}
-  {name="kmouth";value="03vpf0ly044dqjass5qvq9xgp99bizs45cz7lzfhlq8rx4zknjnn";}
-  {name="kmplot";value="14anq2mgd0jb8p82si6i4ggy2gp9w2shlvi1mxamksf9bxcy7ivs";}
-  {name="kolourpaint";value="0x74df72rw0zn7pishca9qjajg2jw551rvz5q4yllk31x96xfq8v";}
-  {name="konsole";value="15w1lj0vaga7fpxv08pkg7wnn9hx8dgdrymk1hxq0ipylwz2clzj";}
-  {name="korundum";value="1hlr5w2nk1qnm7xbgml4abbm4mskipabk46m31f7lyniaf5nh4py";}
-  {name="kremotecontrol";value="1wwwwa9fxdpdy8zz9sbcnja94pmqhl2jcaqikd18saqc0mrk331j";}
-  {name="kross-interpreters";value="1hwwmg5l912ahb1bw03zjg3rlycz6lmwnbr8bssrlp6mfq9by8xx";}
-  {name="kruler";value="10c3l0nxr0v1x1hxmvryj8hw2q7anmi75610m2spbzh5n0qrhzky";}
-  {name="ksaneplugin";value="1by1mxilyf5nv6a12pv31fb01q1mflnzr0dfshk2fr0i927m6rxw";}
-  {name="ksecrets";value="15rad9gwhbwan51qljhdcry0r5lnf6mrin524q8b5djdhk9w2h3v";}
-  {name="ksnapshot";value="08asqkxxzk3y5lyahygksdjvsy6a65x3jp2j5pnbgpf1yd91wl0l";}
-  {name="kstars";value="079f315sr2wcjawx73wlkc9nq9nnrj83d8l59jqiy3nmzsspjmjb";}
-  {name="ktimer";value="1s2ymf6kn5hhhqhs9nnqfsfgsy137yk2ais3hpija5mz4a85w0zr";}
-  {name="ktouch";value="0434s9d1i3nw2slxz74v66c84mzlpm7jlfz666w1h5nm8870d3r6";}
-  {name="kturtle";value="0wivxlf9wprd0baq8y9ygybc77bl82gq7wmyx3zaf7jr9nifish9";}
-  {name="kwallet";value="1227s24qs7s4ic2dwk7kw7rcw8lgq2k2vzgbjkmydk3d9wjzk6nw";}
-  {name="kwordquiz";value="0hc8bf0m24m6mnv7vk74sz7cjw1rc8wshy76wvp671hjxmajprdm";}
-  {name="libkdcraw";value="1j3x5fbi594yjhmwx1gzar45yjh0qazzx58bq6xh0zb7xlc47wfg";}
-  {name="libkdeedu";value="11v81ba5y9p5zmx51d5w5lgr6d32bahclx82mxzyb5zypzc7kb4s";}
-  {name="libkexiv2";value="09mwd2vzqkxd3n7rwq5xf5bjqgzjnw5mdzz9svx3bppvcsc74xj6";}
-  {name="libkipi";value="1317zrrjgx04pnq7xqg2qk3bzpr1fikkivqwf133b89h1ksdqdwd";}
-  {name="libksane";value="0fi2iigcliild4d4gzxy3n7lz41vkwwxsychn0knjvlbgs4ykjfh";}
-  {name="marble";value="0qifpsn6z22akngxi0hjslp5qh4avr217234z1aq6h7s5wql1f0x";}
-  {name="mobipocket";value="02k0k306mcnd2c41sa5hr76lm5asd4qqp7x2zy7ksqyfds5n97fs";}
-  {name="okular";value="04v2qdjn1mgc1n7fq17r7z2cb7zlc7bkvm6y2cqqllk70f4s4kmh";}
-  {name="oxygen-icons";value="1vgdp7lxbkm9a43x0y1q1446qi57c7r1nik5a89lakyqjha6c0yk";}
-  {name="parley";value="1gr941sixbjpl410qks25dpwgp81sjg6f18196p2a629aqk3ghw6";}
-  {name="perlkde";value="02jq01bf5wszc8i9mnfgzmx8385if3lxyj0nj65k22hv6s6y7jic";}
-  {name="perlqt";value="0zzmlr7hp8bvrsr2k6z2xrhb33vryvvxhk0a8aiwii0d84qfws8r";}
-  {name="printer-applet";value="19z5zrypvdbvn207ygbsz418w8gan43lhs55hhk8gyjks0kbks9v";}
-  {name="pykde4";value="1sb06rppbzm682s7yjlr26k4n78l9lzmhvmxzgysxw9br54dk1hc";}
-  {name="qtruby";value="1g8s8i82n5hxs5lwiipgvgwzripd9injmgzrvgxfdnf014772jf5";}
-  {name="qyoto";value="1pnnjj75mm488chd3v79g628b0fgxgglvj9iq6gd2s9dkld3gw2m";}
-  {name="rocs";value="1xdswahdsvr3c6cf4cf2c51l5v14sd3r3ac6j96q5sk3siv33msn";}
-  {name="smokegen";value="1pc2kg6i0476fvcg9kl3787k40g56vb2l3zb0xqx6cwr13m8lvih";}
-  {name="smokekde";value="1l74j9j4m6lp706k1b99g7l5cklpzdn66snrs495a8k9789vgv5c";}
-  {name="smokeqt";value="0vxmfp0wpdg47x7nz7pl220jzgp6ya4jrhk64an9wpc506qz3k1x";}
-  {name="step";value="11bihc857vi97in8zly5p049acfr74asbis1r4y07fsip2945mbz";}
-  {name="superkaramba";value="02bd14gik9i4ag0j7c9q4hk0f28m0g64wa9gcgmgnx7kwbsfzx5y";}
-  {name="svgpart";value="1px8jbdpfyjm44qwpm2b0brc03zhha5wbj9wpx7lrdq0qyrwiyf6";}
-  {name="sweeper";value="03gsh431gylqii92v5lc7f7417kjgmsg1cyj861wgp9rav2hf1av";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="mobipocket";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ksecrets";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="printer-applet"; sane="printer_applet"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
-    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix
new file mode 100644
index 0000000000000..f2affd3309580
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix
@@ -0,0 +1,299 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="080s52jr6qbag4v5z2yw6jps5r8am2vfw6g8lih7ipq2vhf9rzbp";}
+  {name="ark";value="1mvdalg45nn33bgfddqimv06b6l25ja0na2vvcfdmk1jxw7yzcr7";}
+  {name="blinken";value="0ajgh45y8p8db6yx36vrl6a81h7wylx074wv4lii28gqvgdb0qip";}
+  {name="cantor";value="16s03wjm7yz0fck754d1590g5n0nv4nsqf9da32nyjlivlp5vh9x";}
+  {name="filelight";value="1rsb5n3fx90f2ln2bxc7m2d6f7fg45f02ch0dapv2qkrzc2li4jf";}
+  {name="gwenview";value="1131nx5a95mshj55gqgixsh4lslk9rsl78pm98mydqsdqvlns8v0";}
+  {name="jovie";value="1bg64z3yxwi85pl0yimzbb7a7r9hjqpmplcjb6v3qp6mazymavin";}
+  {name="kaccessible";value="1dk9m2mmm553mx9jjmvg8qpvrkjzkbzy4gqk35yz33nkfdpcqdgb";}
+  {name="kactivities";value="1bk8prycvck4ad86d5pj77czrbwfl5s1a3iq7245i30wl0nkdpr6";}
+  {name="kalgebra";value="08azpq13wm8crgmwkvrhz77gzhywy6h079q36wffm1d0nr5r1f6x";}
+  {name="kalzium";value="00q8alp4kry9q21nf29w9mj19m4c108mdn3c8rfz55yyy6mkcr2p";}
+  {name="kamera";value="0lqw2zdc4vpdhgdg430b07gcd73kann4x054gbg3cgvrkjm2kw3x";}
+  {name="kanagram";value="0z37x65m8p01msl5zg3lqfzb09wali0wnl72rqr65rvzn2h52j08";}
+  {name="kate";value="01mqahcp0c7n90m734ky455nlrgciqg5ranp5bvffkw3zj0i6qx1";}
+  {name="kbruch";value="0z1602khvp1h1xc2d4vf6gxvr7slfq79n403gmqxy0a2qdnxdi8b";}
+  {name="kcalc";value="1q1j93ivq2p8dxz2lf9ylp3jh70136iy9l7n1k06y072kjamwcig";}
+  {name="kcharselect";value="0q67cngwyadks66a3imgw4iqkjinb7hdlgah0lx8gb2nn0pdk0n5";}
+  {name="kcolorchooser";value="0h909x9wiwlfk0bk5yjzdpd7x14rqbnz353svkraw54k1p73y4ga";}
+  {name="kdeadmin";value="1c23b54gia9829nblicys0vpb2lz3cya4s9h3637jsv0ksxql8jy";}
+  {name="kdeartwork";value="05bk1m8nz6m1px8fha82iwjs73yakjn5g0kmsplnxk2f8213r9v7";}
+  {name="kde-baseapps";value="1qrl4df3340iqshp54f2f2xqjzc87byvknjdhc9xx0npq8y8mn4w";}
+  {name="kdegames";value="1d0cw0ri9bcrk89ai1bx6cqw6jxa2f13bzf9qx8ychgcpmp7raqa";}
+  {name="kdegraphics-mobipocket";value="0mvqa4ln9gbpisqmdksmg3jizaxwwp3d45c97fg3pspybmj2mi4r";}
+  {name="kdegraphics-strigi-analyzer";value="1d6hf876ssql4zkvkwp34q73rd38c528i2xda35gd56rg9baszz9";}
+  {name="kdegraphics-thumbnailers";value="0arpazfah4v1db1bh1hf1qzv1mjgvgs9czm5bi8k28xsfm99yqzj";}
+  {name="kdelibs";value="17haj04m7af5xh92l5z6a42nscdgsw2cfkp50ikr6crqqr816967";}
+  {name="kdemultimedia";value="14678fbjban7yz89wqsrbyn050myh1py9d6d9811njvv1kjj56kb";}
+  {name="kdenetwork";value="1qyr9lx8hrw4dp27p72zwnhyiammiv69rydr2d9yajrl7b69ipz6";}
+  {name="kdepim";value="0n05hgzazc55s04kglv2bgjx1kri1pjf0rdy2y6lwfwqchzmnnz6";}
+  {name="kdepimlibs";value="0zl3pf7nhg21b999pbhhz3ppdr0n5y3gibws57r483zb9g6c8iq7";}
+  {name="kdepim-runtime";value="19whdvwjf56s2gq4ihvlxd761bvlzv8kagcvzdrhnrdapilf2l57";}
+  {name="kdeplasma-addons";value="0sq5mnzhnrzhlgw79mwr764gahqd1prj9gn41hxmlnmqd8mqfycw";}
+  {name="kde-runtime";value="0lx7qq78y8xlm3wmyms1zzj5z4wy1iw69pv1xknz6dnx5s3znx86";}
+  {name="kdesdk";value="0wy7li6agzbfhwza9zqbpfnmxigjilsf0cg47lnz9cc35k1ddq5r";}
+  {name="kdetoys";value="1rimzsjdj8ikvw97cjzdc7v6xcib7b9v7fvdff2rij6caqlqy9ha";}
+  {name="kde-wallpapers";value="0jf3fb33vlc1srwmyqhd19rjllyp4vjfs8hcp4yp1z6chf817x7m";}
+  {name="kdewebdev";value="0mssi6k2dxb2cszc43ffiw8n879ccyx0znr9lqvgn1xj6lbq0xd9";}
+  {name="kde-workspace";value="1vmv0kzh91lfa4kyvp111hf85fn2480rc4dhld26a7jck1arcsqi";}
+  {name="kdf";value="1ymaiy6mlq44c7cma4ka9214vb44sgd5qijhv8q6cc02i1n7pzij";}
+  {name="kfloppy";value="06jdskyfmcckyvmhh7h689j2pdrn10w3zafasssvibz9vs7ckk6h";}
+  {name="kgamma";value="18ywm3801vpi4lza5n23476irk3m3djf9cbya468kvs23m67604w";}
+  {name="kgeography";value="0dkb7riqbigak5bznfmq0l0pvacskcxjxwgnh2q9pzdsbax6g0y9";}
+  {name="kgpg";value="0b3pdv4xnlh6xg7vvr3vnzlcggrk8a9a8cq9lwwlzgjvhn2ljk7x";}
+  {name="khangman";value="0ykz88q3w527avjqq4zz9dbklkwhv3x52fk7x5bd352n3yvzc39g";}
+  {name="kig";value="0wkw2jngjc04g0ydc6rz6abnlqpi9l57yf9q6ad2xwavf8naawhh";}
+  {name="kimono";value="037l6d5g0zx7x52nd36rz9yylnpinpj7cgdw2laiczyq15r3w9wh";}
+  {name="kiten";value="0jnkw324plbp7h4ah75k98nai4vpw1nmsr4hg5cflzc2nqmvyigh";}
+  {name="klettres";value="0b9p5hlx3pk8h9p8z7y62mvx96k4blv73nmw7c7338apj0xk2xn7";}
+  {name="kmag";value="0hcy8y7y6w746p6ka30npsnmhwcr3s2263s7kspcm8k4xf43z51m";}
+  {name="kmousetool";value="1gqdsfzywj5iz8skn75nwa6gvzfzd4i3vma9c098pa508srachf8";}
+  {name="kmouth";value="1jijjpppr49za141fzq21bn7mgfp9z3vsyrrb8ik7v84zx4f46dk";}
+  {name="kmplot";value="0mzr4pf2z5j2b7af4rfrn5spzcb1nllk7zkn460izhmr5k59hrzl";}
+  {name="kolourpaint";value="1r2lcrfswm9mivmjwj37w9hkhl9zbmn7shrwl0xjgsdpkfqzd130";}
+  {name="konsole";value="1k1r85j72vbkxg0balj95d2b24gycbqlfp4632krkp98p27k9d3r";}
+  {name="korundum";value="1xy0gqms9fa0a48z1bwf0p6293q23fz4hyrm02b4c4bn08c2izp4";}
+  {name="kremotecontrol";value="05rmjq67bxssfyzc82ba1b77zv3nwmjyqf9qh43izj5vlf9cd0d5";}
+  {name="kross-interpreters";value="1dw5n6z29mlgc8x9za914ppd6f7maik9b61pn6m9b53rjcf3xx10";}
+  {name="kruler";value="1cw37khl676l1jqzm74bajdjzky0w43y4kidy7x5ycbm1bw1wqmj";}
+  {name="ksaneplugin";value="0vmamcmy8g9k63dm9vnbqhyjdalh8a0ypw8xc1wyanwnh3plvjxn";}
+  {name="ksecrets";value="0yb4dlg6spzgspg6ax9lhajzp201v5dblrldmbg0yja8w40vz4cb";}
+  {name="ksnapshot";value="0bwm48a22xm57zw0wznm9frslabzlrsl701krf4dggwvjgxjcz7f";}
+  {name="kstars";value="0swqj1pvlb2nmm8bfw00nna2m481545271hnpk5mhrmmxzmmdvs1";}
+  {name="ktimer";value="1isx067ccg5w95wlrs1z6xcc0qkdbr6ngi6i7qh7zb4f4v594gkg";}
+  {name="ktouch";value="1nggn0qw2wf86cgsy1hnk99f5zrfmw5x3gzwm9czpniyvh6w7yyv";}
+  {name="kturtle";value="0sb7pkx75i7dc0qg6kbb7hdjkfkkbbsadrvygk1rq5wmahh1piaw";}
+  {name="kwallet";value="0jizkaxa5y95h8fh07yfij89zw1jidr8ysgf71d8fmaswblqkv7f";}
+  {name="kwordquiz";value="02sdpr9jy738rhlmxllzpri1f6hmc9qb47fki8lb2wqiz5rr57j9";}
+  {name="libkdcraw";value="0xnb5ksydkvdcvagsfk5bksz2k2kwawjxl6v6pr0dld86d621051";}
+  {name="libkdeedu";value="11dnnfnxcc130qrmmr7kjafy2b91z3zh4k4sqsfq5v054kmr5vvc";}
+  {name="libkexiv2";value="1knn3igvpwc9knvb83yq2r05aax7pwv33khcjhhmxh55ms1kiz31";}
+  {name="libkipi";value="1pbrplwy8r58h04b96dil20a31bn14szz71siy1h3whn2qg3hda4";}
+  {name="libksane";value="19r6lnr92yp3v0w9rplggyfrnw19k1x2nwsvv7rhapwxqpqszpks";}
+  {name="marble";value="0bkihnkmzwqgq0fghb0qilhw2j66kkbal0nds0h4zgjml2mvf4kk";}
+  {name="okular";value="0hzj4rn9vdisq2v6lka6986slcb04h7s3svrgk9mh56l062vavsd";}
+  {name="oxygen-icons";value="1jwb95zscvqrj6g7a8kmzzywyq72wwldkkkf0klwczpd6kclzbf0";}
+  {name="parley";value="0ja3fahwc0dpfnabvpa1gsqqwqdb72wbvnl79m1asd7f7hlj9s1v";}
+  {name="perlkde";value="1nsaqp3pyyf8lpnnqw28h3gsg1f0dgbf1cavl1k00w997v6ih1k9";}
+  {name="perlqt";value="082fn1bgj5ws1df8ixnxj7z4n4x5b1mn8wfkszr33wgf9jf9sa7s";}
+  {name="printer-applet";value="0sx0rly7rlnvd6hcrnh8yn35r4vpx8lkvlfgjkqp5bksm3bc3ybd";}
+  {name="pykde4";value="1b00xswl5ixi84dk3c2c4wn4cywpj0bgmg57mhilq23r9dp38dwl";}
+  {name="qtruby";value="00qqhv2l7ad4qm2rwf7iw4f2vgz3slxvlmzsz1wd7j6m1z5n2zqr";}
+  {name="qyoto";value="0nhw0l0gn08h6fp3msfn5iq2q49pkmfi611a11nw1n3057ppiis0";}
+  {name="rocs";value="09a9jgb2088xp1z150zjr36nzsrxgzkqhvy2rxq8qj0ls7m2mcnn";}
+  {name="smokegen";value="1wp7kq7j3vgrnzj4g8fqmmhdg1nkkprnm6g25sn9zw9s0f4228l1";}
+  {name="smokekde";value="17sb2fpb84s15pza92ah3g1cbjyxjjpxb6ni2qjpin45llwdpz06";}
+  {name="smokeqt";value="0zdckhi52hjd5ajlzaas8ykcm5qh5yp48vrdh4cwvj8sv32bhbgd";}
+  {name="step";value="1ai50fc75ahbzac7ssvwhz81wg75w755pxx2w68ibplrw1qihrsh";}
+  {name="superkaramba";value="0gqg2g1h9h16wsfmw7875njdj2p0n51p03d0x10i2zajf9d34hhp";}
+  {name="svgpart";value="09zsdz69n08ifkq8f27av360zky4qpvrn234xnbyq48y0dcvjv2f";}
+  {name="sweeper";value="1wajv5jnx1nbckg6zrqy0imdrb8hb4nfb6xg2fs9rqx942c0bhzz";}
+];
+modules=[
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ksecrets";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="printer-applet"; sane="printer_applet"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+    { name="konsole";  }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+    { name="aurorae"; }
+  ];
+
+}
+{ module="kdegames";  split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdemultimedia";  split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk";  split=false;
+  pkgs=[
+    { name="cervisia"; }
+    { name="lokalize"; }
+    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
+    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
+    { name="kcachegrind"; }
+    { name="kapptemplate"; }
+    { name="kpartloader"; }
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kioslave"; }
+    { name="okteta"; }
+    { name="kmtrace"; }
+    { name="kompare"; }
+    { name="kprofilemethod"; }
+    { name="kstartperf"; }
+    { name="kuiviewer"; }
+    { name="poxml"; }
+    { name="scripts"; }
+    { name="umbrello"; }
+  ];
+
+}
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
index 97bfc1bfabf52..5de0caf4ba9eb 100644
--- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
@@ -1,12 +1,15 @@
-{ kde, kdelibs }:
+{ kde, cmake }:
 
 kde {
+  buildNativeInputs = [ cmake ];
 
-  buildInputs = [ kdelibs ];
+  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "101v30x8sw96mq43hs7wzppjc8xhh2wn4qpqbi3nxrb16fw6svad";
+  outputHash = "208ebe74f3ffc83fc51cd1197ceb2c5b8b8de8f33fab86b760bfc41d31c2aab6";
 
   meta = {
     description = "Wallpapers for KDE";
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/mobipocket.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
index 2c2ba3796a2c3..2c2ba3796a2c3 100644
--- a/pkgs/desktops/kde-4.8/kdegraphics/mobipocket.nix
+++ b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix
index 144968f667279..778879e6e7c23 100644
--- a/pkgs/desktops/kde-4.8/l10n/default.nix
+++ b/pkgs/desktops/kde-4.8/l10n/default.nix
@@ -11,7 +11,7 @@ let
       name = "kde-l10n-${saneName}-${release}";
 
       src = fetchurl {
-        url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
+        url = "mirror://kde/unstable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
         name = "${name}.tar.bz2";
         inherit sha256;
       };
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix
deleted file mode 100644
index 0ed6019de7a62..0000000000000
--- a/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix
+++ /dev/null
@@ -1,272 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0x1d9zp9vb33qs88xvc1hf4rinbhxicvzzmp1d3jj25k1ra938kp";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "0mzfbjhq0lv3dr28nc0wrhrngl3idzpak6nbnsya32zpbrwgrzlz";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0f5xxjgnasdnjfb6ksii9i44cia0vh2icwwgg8vdj0b62bdbd5n6";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1b4xk6izq74c7blhdb0ws2nsw4i3q62jcr7w91r8b4j76bhpgif4";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0rrf2gv8mn1bmzsqkgxgxn0gjikvzrcxbsyfs3dx9s42brwknn3s";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1wr85m902jfk0ykvl6z7pbb4v852f35c9gjw4x7md9v899k6lc4g";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0bn4gnm8zljji5av7jvc5jypwr9kqcbc7fdcjljm7sd0v2fg32m3";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "19hmsm49lk446425gf4ffiz8hywv9fgnwfrc0i6s0409sfm64jb2";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1ck8ga9zyag24wl03qf9kfawpf1a163d2may3g0cs9iircg0fwxh";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "15q25dnyxafgk2glcyk7zxfv5mg2s0cj8440clfj2xxhrkhghlij";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "066xw4n8vhq8zdqhwi7pf3n9iyvn1i0lrwiyc3pc0ji98sdfyv29";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "103lvb2snik42g933dsl713ik0h853r082a82dm0b11qjgj9qcni";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1jnnsj192qflwi2n0b2f01qprhxr7f41nn4iqw7iw0vy11hsy41a";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "1lk4why9cfbzlj0kb5n2q9hhlhk9cj5i8h88abni4crzdgg5wrfk";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "10z0rn2gmq3cyjwab9in6c7s57rhyhri3pg30nhbfpvh6jsph36j";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "0xipq67yjriqy32shlp70kkvnmsjz60j6pjyqk9hvmivsawdvxd6";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1c60xbbg03r9laclwnbrxixj8mvang5mcz51szd2s5kml6b4nqb6";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "181153rrxdxdhcqqczyjw5vwk5lm7dyd46xzvk2k6n38zcvmxklj";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1ivwj638m6izg8v9zdhlgpwihwkc0zcbsklb149ar9az88zmafvm";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1z945ccxa0k4adfczb9yz1zws368mgm7j5lq1rvhipkqy82vyfmq";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1l6w0d0r09d992vsvv217rq4j9viv681xgpfx9mawvlv81qf6ksx";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0bx27j8rlzwd6zn2plps9nb1nwpziyj5gbjqlrd7z1bga957mnis";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "1kslyfxf0isigrlwh4rr7n7pivs6cv35bvwwvn7qrz8x513x1n8l";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1am2qlgdww8knqj5lp1b4hvsx8anyncig6mf8iws855lkrbffaci";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1fs8hjz25ryivxs191pvld0ckys8dbfs9kkhq6fv2d9f88igwbgv";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0f5crpnqaqyi9x5j4s86iibg28kxsrbagd1i6h0p0lwrfr9yymqf";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "10r7qjvmpz6bl8j7wj755z69cik540ybfhm8mwbgcaafhfxgl1na";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "0lv0d8bcva00g5ydcirmz8r6ki0014v97grk1x39f1rmq08zba9b";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "0qpxzngv556rrdlhn8fxb5qar5gvfx4vgmpkc1s1qzfn8kxq6ggz";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0v0kpbh7brrfqjv40f05gqjf54azfpcar1rrm5fa2gzji38zj6q3";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0clzy04vj1dyj52qfszjmfjlwf0r43ffmsskwmy8xi82249pclg0";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "00id3nf7r56s9yfwgkykin99rikg1kkrj9c9d9ncl16vgz68yzv3";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1l76kqb9n7n59krskn9j823h57hxqzdzs7kqa4vcm04in31a9za0";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1hgwxm8pn34dp33r7kwdk0vw3ic4ahg39ydqg2mj62h35la3w1sm";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1kna3i596mynijrjznqh4b8gqkd66s776yipzjgpg3zlcc21165f";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "0rkribndan830wd7s1zl0hq4jfgnixfsv61hi5r6l6r8bbn9fl2p";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "16bbiqxafhffwi8l94vrj22gji5k861pb5dkpnws1n20lk87j5kx";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "137xb660khkb5k9j0aq6yhn8bcmi7yr3lfmcbchx3xq81cp02v9m";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0c5ixw2bkr9kr7xl83s2zvbp5ax8353bhaz7l89w98dshhvdlbsj";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "00jhrccv5ikn939c7pric5f3hs698by2s8aksfhczgqh29bwmkk3";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "07pyl2kmf994dzg9nw4xvby1cqza1lwpn29wjrqrpvjw96m1nm8y";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0d1syrbxbnwfph3lq02jhw0422yivan7v3b35rfk07zvc13nzx0l";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0dbkdp5fq4421s4m4lfgj6jhi7wa9xbgf2v17pd2bkyd91jixr2s";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0f320v7y68dfdnlx9dpa4719rvil0b4qvnmgpha2mfvagql29hxm";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1fii0px1r5b1v3q812955qmr3w3cqczh8x2qqcr73x68bk839i8v";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "01v0nwshak7wlgpcalh6ificsyx85zvn4g4j7fz12f5y0189sdyb";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1cz6xdjraskh4ri8bi8j9pf87g03y18hn22jk03y7z9xrzy30lz8";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0bqfk0kvj64gbcgr84ygbvpwrh7lwkpi33lirncrc5yvf4lddqmd";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "0g83in6ahf5lni206fiz90lmai9fih77bsaa1i8x4iyzddxrysv0";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "0401g7bz852rj86gipslcw713dq74p58wk8zkmh17xxyqis4n82m";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0q2z4klq42cyh1czcyd0f9105a90dxl6diw5bhlw85v3n72i0bl5";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "1by2804w8gxv3l655ga5mfw9363saq02s7vfbc7kc4vqpjxvbk8s";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0x8l280ymdxf9w7rklf1wh4bl7mskdbq2hwgm2rsjvm2cvqifjil";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0iv36yi2zjlqnhs6n65b7j4yjh01mdbr3lg35a17awg2a22a8gs0";
-}
-]
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
new file mode 100644
index 0000000000000..8fc2bf8be941d
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
@@ -0,0 +1,262 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1payn79mk0xw6laj3l9zymh3a72yhssid4wxw2sg8wqq1557cd1f";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "01k26c2shw2xxhfgllljqcvrgib6935dbrimrbix7snwdxdip23b";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "05vfkzqqm6sz0021rh8qhn3345fmcswlilnkdk23kjsb722v0m47";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1ac7y69877yisfcz863w5l4ypiwp3dxip08myfwq631a2qhplwir";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "0qj5r4gs1bm2hzds8gq3dzai7h7fw6dw8mssw14g2yb2w833ag6h";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0rh0pivdiybp6n20dyhdrcwc6q3xmmv4i83x64qnxsxdh3yxcysv";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "04ylcybr3vpk4vja33iq9ysnljdndvk62vvs35rmvb48sqc02gbr";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1rz1qvy7n3p78idpw8kah991r5rs1hgdlr4kh4pfdk31qng6mdhi";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "19hhw9csh59hh7ax1g9yi2bqqv712xyirklaxq8j5225xxva6xhx";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "08rwnn4bbp3hhj6fw1n1jdm8b3k72wk14qib2jdmwra2n514i9y2";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "098nsrsc7s77kkjh6cai7nkw6h0cz10gd5aa6hfqnafc42zjj7jv";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1avv6xvpqcc1q9k3xcszpknbshkcd1gbmx9nrx2a242jkkgbqcm5";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "14wqf7bfrhmkknrzdn8725rhlphp2czzf65rc7wfsqj3nk0s8iys";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "1w3zlf70a9hcwkyv8jc2jr7ddlq1bjbbswrw6qaincpk5qpr9lqc";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "1gwjbx31z3g7p3am003bll763d1jjvz8k3w7k318x18nbsj5nl2h";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "0a4yfz5c6pnscq5810jirfl0r0asid1fb4bsyh356rbhfqvx3cf8";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1214wmwccg6k97c3q5rnazggjv77mq640wwv23xv3lzyiqxq7h45";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0s1wjymdprn56pd311cb6g14kfngnqnbcar8yqn93mgcdxrl6s61";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1bw997jypbc2rz2wnlvcw9lk6l6kybiivkq6sk4h7kil9xklam2j";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "086sx9dak8npi5nmiyq0npqc9kj5gaijc98bml42q1p0fg92b1wv";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "10x59w6ac2bnz7jgypjk98q80bwnwlix18pz9v0xnhw6z5c71bmg";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "0znwyagr8xarw3kjybgpzgxgk7dzc1sqvv128g3l5vdf5cn6ab3p";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0w6nwpq0wxglzspswhiv0y6rjvmcg9c3wsiagjqr0ys2ln1kifp5";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0d6fhgnzpapb1axnan7jlsyln0ajv9c08zy56mvcgvnprj92ixjh";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1f9ys9slbf6n56g29pxi4a2kl8fp8bgfg9r4n4ygxy6mnl2wggn6";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "033jyrjfywwg1mibcwbflhblbv17kc9mi6wbyajgnhrypaxdplmn";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1w3dxprfdrp4b2ar61jvbgngjm85nwy5jprjmqjzqb74pj9wvnnf";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1vmx35g9w6zf6pp6s7k10bmil6hppms4h54647dz27mlqq6kfi8a";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0mmhmw4fsaxx44bs1g903cfcn854gqm509j2fiman8mz58nsd8jn";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "06gmdcxm0cl4yv39xyhz8nkrj2hbiryx2zb5b7zmyq6l94vmbp83";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "0yagn8bragyqp38186mla31farrd26q77vm4zmhqfrvzbaiaal0c";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "073cgksqp8gxvscg6v7gkf4rd4va3cqslwssbzdzark3lrm7flkw";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "0dwvr0779dg380dv2a4613074gk1pqbiv6q8drawgj8asaa54yg2";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1z10wi3grj7y2a1lyjc9xvadrfm6b3ydgy827183mp3qfd6r0jd1";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0mzbfizgykq20vqq7b1wna3jhvl73qgr2n11f9mjysj5g592mqnm";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "1bg0p2czkmx2rwznbwqq3w16xdp09k0jajpw2jwpdz84z1y4c4pz";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "12zzxsdzb80gs671k8dfw84yb7c1pli2jwh1hncr6ajwbckd4q6c";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "1rzm8y722jp5z8xlms5gv1qsybix0vyfvn5fv18zxkiaidiyzlfh";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1bbz8ixlhywnfm50dm91ykn13mf0gr1c46rj8pmzxqlg2klidm5n";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "06763cbbw4bh3y6lx01s6gl4yr4jlgrw73qdxjw30r45hqybblx6";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1wgzkjq3pmmrs8d7q2b4wkxkyaylypk25i6h6pi7ly5im1fj0zf3";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "17zmirf67am4730yf1x1kidaylsl89frziiw8jzf42z88qc63x8x";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0yg8x6syad3g2j0nlgcb3ypp26l9m1n7wpxgyhnbhb07w3gmvwf1";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "0a9qil6m5fmbi5x8h2nwj6al0awclk77zgpiz0njv9vdsiylbwzf";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "0h62wnhc4m6j33r0w6wx5fkwdacd3y1mz6s047jinzzzvyk6zy4p";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0c23p15rbpg8lmcas61d67cpvsx0rcb9s5nccy0jr9gs2bh7i02i";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "1wddr9zr0fz4g3d80xdk1y7s60yrb700gkw4689m6cn07drixhcr";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1k1fg6ymsyb86jzq9pdy77v568pvr9kykdmvjy159qripyr5gyjq";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "02zqwgjksb7cxsqxwd7fgagza1skjikipknwxaylhb9qc5s5dd2r";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "084nak660wcqnvfg3zw2pgglpzwkc1mryd575y3xq11a6aqyrwqi";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0c18dhjfp72br8ayrn095201ajnk8zbr1cqyni0qmis387w746b7";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "04n6zljl3yb8fb5lyz4v30ki8h7k7iic0wz05cmfnc8w5x5zdfxy";
+}
+]
diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix
index 6297a55df7649..7896e804aa9d6 100644
--- a/pkgs/desktops/kde-4.8/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "ca03ee0a7bbd35ee70f84d32b6f861ee8c019473f16c6ecf6309885317bcfe51";
+  outputHash = "dec510cb1dd47d4254e97021964dcbdcfe4541368a0694ee986666ff745b6860";
 
   buildNativeInputs = [ cmake ];