From 7c4ac4d14bb154181207d7d7532596fe8bbfe66e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 22 Jan 2008 13:10:14 +0000
Subject: [PATCH] kde-4: l10n added, various updates

svn path=/nixpkgs/branches/stdenv-updates/; revision=10243
---
 pkgs/desktops/kde-4/default.nix            |  3 +-
 pkgs/desktops/kde-4/edu/default.nix        |  5 +-
 pkgs/desktops/kde-4/extragear/default.nix  |  9 ++--
 pkgs/desktops/kde-4/games/default.nix      |  3 +-
 pkgs/desktops/kde-4/graphics/default.nix   |  5 +-
 pkgs/desktops/kde-4/l10n/default.nix       | 60 ++++++++++++++++++++++
 pkgs/desktops/kde-4/multimedia/default.nix |  4 +-
 pkgs/desktops/kde-4/toys/default.nix       |  3 +-
 pkgs/desktops/kde-4/utils/default.nix      |  3 +-
 pkgs/top-level/all-packages.nix            |  8 +--
 10 files changed, 87 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/desktops/kde-4/l10n/default.nix

diff --git a/pkgs/desktops/kde-4/default.nix b/pkgs/desktops/kde-4/default.nix
index 28b792f3996..11554c9955e 100644
--- a/pkgs/desktops/kde-4/default.nix
+++ b/pkgs/desktops/kde-4/default.nix
@@ -2,6 +2,7 @@ args:
 rec {
   fullargs = args // { kdelibs = libs; kdepimlibs = pimlibs; kdebase = base; kderuntime = runtime; };
   libs = import ./libs (args // { kdesupport = support; });
+  l10n = import ./l10n (args // {kdelibs = libs;});
   pimlibs = import ./pimlibs (args // { kdelibs = libs; });
   graphics = import ./graphics (fullargs // { kdeworkspace = workspace; } );
   multimedia = import ./multimedia (fullargs // { kdeworkspace = workspace; } );
@@ -30,5 +31,5 @@ rec {
   echo \"#!/bin/sh\" > \${scriptPath}
   echo \"echo -n export KDEDIRS=\${KDEDIRS}\" >> \${scriptPath}
   chmod +x \${scriptPath}
-  ")] ++ kde_pkgs ++ support.all ++ [shared_mime_info qt];
+  ")] ++ kde_pkgs ++ support.all ++ [shared_mime_info qt xprop xset];
 }
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4/edu/default.nix
index 77fe86e2178..2a218300072 100644
--- a/pkgs/desktops/kde-4/edu/default.nix
+++ b/pkgs/desktops/kde-4/edu/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1wjy1rm7aiib1lv61wx7mcbkbpkk6phcz1q6dy51x0hfrc3rdkg4";
   };
 
-  buildInputs = [kdelibs kdepimlibs boost readline openbabel ocaml
-  libusb facile python];
+  propagatedBuildInputs = [kdepimlibs boost readline openbabel ocaml libusb
+  facile python indilib libnova];
+  buildInputs = [cmake];
   myCmakeFiles = ./myCmakeFiles;
   patchPhase = "
   cp ${myCmakeFiles}/* ../cmake/modules
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4/extragear/default.nix
index 93e41c6fbfa..5bab882eff2 100644
--- a/pkgs/desktops/kde-4/extragear/default.nix
+++ b/pkgs/desktops/kde-4/extragear/default.nix
@@ -8,7 +8,10 @@ stdenv.mkDerivation {
     sha256 = "19gmvqkal11gg67gfmdivxbhwvggm2i6ad642984d97yicms7s9k";
   };
 
-  buildInputs = [ kdeworkspace kdebase ];
-  patchPhase = "
-  sed -e 's@<Plasma@<KDE/Plasma@' -i ../applets/*/*.h";
+  buildInputs = [ kdeworkspace cmake ];
+  patchPhase = ''
+  sed -e 's@<Plasma@<KDE/Plasma@' -i ../applets/*/*.h
+  echo ${kdeworkspace}
+  fixCmakeDbusCalls ${kdeworkspace}
+  '';
 }
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4/games/default.nix
index a8df422f278..7662b37f420 100644
--- a/pkgs/desktops/kde-4/games/default.nix
+++ b/pkgs/desktops/kde-4/games/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     sha256 = "09ilgi6l5sq4gavskyhfrv8ra3n3r6xdn8cdc7fm2fi3zah4innn";
   };
 
-  buildInputs = [kdelibs kdepimlibs];
+  propagatedBuildInputs = [kdepimlibs];
+  buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4/graphics/default.nix
index 18ff1025590..96c37836324 100644
--- a/pkgs/desktops/kde-4/graphics/default.nix
+++ b/pkgs/desktops/kde-4/graphics/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     sha256 = "00np19mzmg8zs8j89g1f47h3kj5azgnv3nspb8lw880zg682yp2f";
   };
 
-  buildInputs = [kdelibs kdepimlibs libgphoto2 saneBackends
-  djvulibre exiv2 poppler chmlib];
+  propagatedBuildInputs = [kdepimlibs libgphoto2 saneBackends djvulibre exiv2
+  poppler chmlib libXxf86vm];
+  buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/l10n/default.nix b/pkgs/desktops/kde-4/l10n/default.nix
new file mode 100644
index 00000000000..be34aa661f2
--- /dev/null
+++ b/pkgs/desktops/kde-4/l10n/default.nix
@@ -0,0 +1,60 @@
+args: with args;
+let
+fun = {lc, hash} :
+stdenv.mkDerivation rec {
+	name = "kde-l10n-${lc}-4.0.0";
+	src = fetchurl {
+		url = "mirror://kde/stable/4.0.0/src/kde-l10n/${name}.tar.bz2";
+		sha256 = hash;
+	};
+	buildInputs = [kdelibs cmake];
+};
+inherit (builtins) head tail;
+in
+(stdenv.lib.listOfListsToAttrs (
+map (x : ( [ (head x) (fun { lc = head x; hash = head (tail x); }) ] ))
+[
+[ "ar" "0hpbbi0l9w2l61hcj01j22yb4vcgj09q00ckhvkhvzy4zwzdmsvh" ]
+[ "be" "0xvy4a9jjib8qqy18y48r8np7400wa7w6wj10hzdvs4gn2a4cqm8" ]
+[ "bg" "1zm44fl7r892r5rpx1v0zw5bsigqwfhyq7hyg5n3j19lfvnrk5lc" ]
+[ "ca" "0kvgin92663g7v0yk2fxa5j1cr90v4hp6255gqmhimlp1j4mzcpk" ]
+[ "csb" "0iypwx8jznadqwl73094n8ndb9xbi4ff7pj6im74r4z5jl7mnx4w" ]
+[ "de" "0dd6p43hyd7jid9yvyw6ich8x84mmg1x4qphzs4ms32j1yz1ifxz" ]
+[ "el" "0cr4fm6bnai7qcpbhl3p06zw3ggqsvaf9xhmivxpc70j4b6didni" ]
+[ "en_GB" "0apyx5yl7yi3hp77v21y5dfqlb9mbx79wjk2pnzc16j8rnalq4a1" ]
+[ "eo" "032y966j6yb1wx6c4pp41zy7jl2rviryrx069viwm2nyxnclq4lg" ]
+[ "es" "0m2ajgdbkksvhmvdrz35f60p352w1bv01dy9jsayaahkmd9jzs2h" ]
+[ "et" "17d4jm91y4glh5iphml6pg7vx7k6wbvjnp491lvs4ipg2p6kwdn4" ]
+[ "eu" "0zjlg26cfylmf6r6lrnjwnmvzqh9gavip17vpq3py6pk712p1a6z" ]
+[ "fi" "18yxf6gbiz09yn2ym20qss0y3dcggmg7qfqxz5jcb99bw2szpfl0" ]
+[ "fr" "1fx8yqjdjmgis1hm0qva54q3nl6xwyzamv8n9hzldjab4nblr9hm" ]
+[ "ga" "0j9qipqzxsnyw52fi332rdav7jxcy9dgmr5nsxbmpm8cns4g5lw6" ]
+[ "gl" "0591x9ycj35adr27wcy2slzk4iyni0gvy2f4rqaskkjmrypi284x" ]
+[ "hi" "099lihyima3fg6dvgrafy3yjzij28rx42hy0sz3z9cvy6adb4ch8" ]
+[ "hu" "01wrylzy4gly1pb8614kfc2p1wr48ikzjszn5gm376za3fhjf0wh" ]
+[ "it" "0d632q1y117zs6fibsavwx581cxbar6p3ih4q3wzlk254lr7rxyx" ]
+[ "ja" "055dqnxnn819m7fshcwpibaa750dsx1ppkf1mw8jq4sngrc8r9k0" ]
+[ "km" "01bkbw967rsb8grv9xd9nyn6ij5arr90l3x4ry0wi9syglng0dwy" ]
+[ "ko" "0c60ypydrkbic6hp4rncadmchmhn0b012kgq1w69db3w77vc20sa" ]
+[ "lv" "1b8sbr4fl2250mpf8ms4f8h9cbvgwnx0604q498i4cxs1ja5mby1" ]
+[ "mk" "1nb8f092jnwazyg6y3482gfar7rrxf0i0wisgfm7rmydblb8vd6b" ]
+[ "nb" "007n9r75ig6gx88kdj40f3rccb8z1avvp9l6g2wr85ysfj09qs8z" ]
+[ "nds" "1mhmrkkldkv8gd5rcsyjx0bckacgn2m2fbzymndagd2sp1617hjc" ]
+[ "ne" "0r1hnkk4zf111v3py4zz292d5f51wjxyscflm2fy10s0j6a282jv" ]
+[ "nl" "0rqzrnninv3y69waibi8p9haddyqqir0sagajn20k7zrapjhlwg5" ]
+[ "nn" "1s19ybg8spg3ivc5h0yqd36ry39piwb5a7q2kfbhhv843pgs1sc6" ]
+[ "pa" "00vc84gwvq0xcav28h2vv80j9p80y19mq2mfgjzdx7y63qwqbjkh" ]
+[ "pl" "1xybzvfih1m37q54ihqmcsmdqk8piyrn9crwqybslvvklqrmy51c" ]
+[ "pt" "1kl2ap044li2l48vyym4s9sjybs2vx2fadnk7wdhykzxfg54y12n" ]
+[ "pt_BR" "15ampx9rhrpqxn94ndmmgkcmmd0hxh12xiph312kf5r0xsinxdpg" ]
+[ "ru" "1hydlhcpa2wcp0zn7a3972bc8abscgvaw077vjhmvda3zwsmcfsn" ]
+[ "se" "0r3q20xxdqj5kym1hx6vz7prir3nspgbrrrk9aamhkwwicy03mf8" ]
+[ "sl" "1xa7i7mngz1gpa0hddy1cbkkxjrrb7wlhr8jbbc7n76ll05anh7h" ]
+[ "sv" "10b0f7i11wqjyizl1m6xwr0j8fh1fdap88bmvhxvj6yzmzkdrp7v" ]
+[ "th" "03a1hi6n1dv6ak3i84gd2jv199y17sq9m4rwpqwnx9zcnv4y453g" ]
+[ "tr" "19h45qxng8qy71h3z1s19j25mm9px71z15ifvq1px47xii34hzdz" ]
+[ "uk" "10fv27xh737rvp0ps1x6lm5ybajxbwy2998dsfmkq0zh3j99yn4h" ]
+[ "wa" "1sqmki4sm0mlmvqynpbjbl6xmw5h1dcp7rcmnxsfl4qnxgj3al9x" ]
+[ "zh_CN" "1h7r1bzaicvjad8k4nsmb2pyk11crpa82jhw2whk1136bjh0f9sg" ]
+[ "zh_TW" "1yhb7c9q6fkj4rj4mb6r37fhl3bz4gcsplhd17z02gryjmn4sdjc" ]
+]) // { recurseForDerivations = true; })
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4/multimedia/default.nix
index 0570b6f4035..025c2b1b6e8 100644
--- a/pkgs/desktops/kde-4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4/multimedia/default.nix
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
     sha256 = "14axr1x09k67vb3vaw4g9zg4mq7j14xn9d90kifwap7b76iljbi5";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace libogg flac cdparanoia lame
-  libvorbis];
+  propagatedBuildInputs = [kdeworkspace libogg flac cdparanoia lame libvorbis];
+  buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4/toys/default.nix
index 2c0fdb28959..661e20bc1eb 100644
--- a/pkgs/desktops/kde-4/toys/default.nix
+++ b/pkgs/desktops/kde-4/toys/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     sha256 = "0j7kk4ripg2sw4m8ym96aiyi8rsfb4p7kqp9kmik850flqighhsk";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace];
+  propagatedBuildInputs = [kdeworkspace];
+  buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4/utils/default.nix
index 94f49d11efd..c45e384771a 100644
--- a/pkgs/desktops/kde-4/utils/default.nix
+++ b/pkgs/desktops/kde-4/utils/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0ha31z79ikkbknhyklihzys0w4jfz4qx8jiyja0gwh428f7mxqj4";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace gmp libzip python ];
+  propagatedBuildInputs = [kdeworkspace gmp libzip python libarchive];
+  buildInputs = [cmake];
 # TODO : tpctl
   patchPhase="fixCmakeDbusCalls";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 743b00b87f2..776406b9b92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4740,16 +4740,18 @@ rec {
       libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
 	  cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell kerberos
       shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
-	  xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
+	  xineLib libgphoto2 djvulibre libogg lame libvorbis poppler readline
 	  saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
-	  openbabel ocaml facile stdenv poppler_data jasper fam;
+	  openbabel ocaml facile stdenv jasper fam indilib libnova
+	  libarchive;
+	flac = builtins.getAttr "1.1.2" flacAlts;
 	cdparanoia = cdparanoiaIII;
     inherit (xlibs)
       inputproto kbproto scrnsaverproto xextproto xf86miscproto
       xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
       libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
       libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
-      libxkbfile libXinerama libpthreadstubs;
+      libxkbfile libXinerama libpthreadstubs libXxf86vm xset xprop;
     inherit (gtkLibs) glib;
     qt = qt4;
 	dbus = dbus_alts.withX11;