diff options
155 files changed, 0 insertions, 3498 deletions
diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix deleted file mode 100644 index b77a9e4bfec..00000000000 --- a/pkgs/desktops/kde-4.8/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ callPackage, callPackageOrig, stdenv, qt48 }: - -let - release = "4.8.4"; - - # Need callPackageOrig to avoid infinite cycle - kde = callPackageOrig ./kde-package { - inherit release ignoreList extraSubpkgs callPackage; - }; - - # The list of igored individual modules - ignoreList = { - # Doesn't work yet - kdeutils = [ "ksecrets" ]; - # kdeadmin/strigi-analyzer has no real code - kdeadmin = [ "strigi-analyzer" ]; - # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git - kdesdk = [ "kioslave" ]; - # Most of kdebindings do not compile due to a bug in the buildsystem - kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ]; - }; - - # Extra subpackages in the manifest format - extraSubpkgs = { - kdesdk = - [ - { - name = "kioslave-svn"; - sane = "kioslave_svn"; - subdir = "kioslave"; - } - { - name = "kioslave-perldoc"; - sane = "kioslave_perldoc"; - subdir = "kioslave"; - } - ]; - }; - -in - -kde.modules // kde.individual // -{ - inherit (kde) manifest modules individual splittedModuleList; - - akonadi = callPackage ./support/akonadi { }; - - qt4 = qt48; - - kdebase_workspace = kde.modules.kde_workspace; - - inherit release; - - full = stdenv.lib.attrValues kde.modules; - - l10n = callPackage ./l10n { - inherit release; - inherit (kde.manifest) stable; - }; -} diff --git a/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch deleted file mode 100644 index 378cdb64694..00000000000 --- a/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch +++ /dev/null @@ -1,17 +0,0 @@ -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/files/polkit-install.patch b/pkgs/desktops/kde-4.8/files/polkit-install.patch deleted file mode 100644 index d2ecac663ec..00000000000 --- a/pkgs/desktops/kde-4.8/files/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/desktops/kde-4.8/kactivities.nix b/pkgs/desktops/kde-4.8/kactivities.nix deleted file mode 100644 index 8f726577ef8..00000000000 --- a/pkgs/desktops/kde-4.8/kactivities.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, shared_desktop_ontologies }: - -kde { - propagatedBuildInputs = [ kdelibs shared_desktop_ontologies ]; - - meta = { - description = "KDE activities library and daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/kate.nix b/pkgs/desktops/kde-4.8/kde-baseapps/kate.nix deleted file mode 100644 index 1ffbcf9ebf9..00000000000 --- a/pkgs/desktops/kde-4.8/kde-baseapps/kate.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix deleted file mode 100644 index 45192e0c460..00000000000 --- a/pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }: - -kde { - buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ]; - - meta = { - description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix deleted file mode 100644 index 0db47fb2d7c..00000000000 --- a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Konsole, the KDE terminal emulator"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix deleted file mode 100644 index 6fbaf097be0..00000000000 --- a/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix +++ /dev/null @@ -1,299 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="analitza";value="0g3k6i9ncl8m8xr85wz6k0vbmjq7jwmygm0353jq2lj2hy5i2ipg";} - {name="ark";value="10m6bmiz4ylgbmxx03q0zfayy1zinxx696jczmllxn557z75nzn5";} - {name="blinken";value="1n0m70by3wd5d4nqlgqrm6bg0nplc3b92cn74xq5adi1dfi63ggr";} - {name="cantor";value="1grjxbzyshc9jlmx9gvxfsxdhcgrn391s3bh0mmprnk0kcsi4s5i";} - {name="filelight";value="1fpkwyz74nqm0szfylbjqfxwv25rgfdg03ghq5mncs2ys8mh4rn1";} - {name="gwenview";value="1xxkhq4psl3zq0ah6fp42s5ih1xik0kxq4sb2r2mhkimrsj11rvz";} - {name="jovie";value="103d7c1h3qfqsh6phyxm4g712kykkpd1vls26kypn3d6linc9p1s";} - {name="kaccessible";value="0s772i8nc1lx6c8sjsy3m928dcyackd8pay44b8nlp8k8hzh5x62";} - {name="kactivities";value="0kxpg0bwr9ph3bzndc5vqgfqkxy443chyg3rbrdvgbgb0xm54r5f";} - {name="kalgebra";value="0p5qhxwd6h8kvfd8n81ah0pszaa550z7y2zlzvrgypmfcgx8a802";} - {name="kalzium";value="17sxslsg5pi1xh7l0h6y0rmjhb6nshq9psjjjqwhfl7id6ansb24";} - {name="kamera";value="0r8rr4lq3jrvfz2fw4in83vsxqjm02x16h842r4hnn3k5svaqs49";} - {name="kanagram";value="02wp2rkm5m6920rvs6iyalvv4xczgh21w1mrf4a694j14fna4m1n";} - {name="kate";value="0530rq6pfrim2mfjkvpl9qxv56fykml7aq3awchyda3xbkq7vk3y";} - {name="kbruch";value="1znm2dmsib7svyfqpyhblip5ic4y2xdylax1kxx7ssmjgsi3bw54";} - {name="kcalc";value="1dv3d833ksz9bqrwhq9pbsqk0a8hv3jlqlxbqccwgkx840hmpclz";} - {name="kcharselect";value="015pj1zmlnjr8ys3arks3b1yqf8rh9fc02p0xfq1fkp11ing0lfg";} - {name="kcolorchooser";value="04360b4pjsdl0ckdwipn3y407fmsx2bimkzqqm01hz4vdyb41d9k";} - {name="kdeadmin";value="0qvynvim50xsv060598bhv6pwxd578sg25g1z2dzdi4ih021nlr0";} - {name="kdeartwork";value="1v5an8385d9zjb29ps94xgvpazpvqffxnlvfp4940pj5imdg98nm";} - {name="kde-baseapps";value="0z2jasna2d8i3iy8w4grylfml9a510imhl0bxnsw6whar409rzki";} - {name="kdegames";value="1jji5dw9qllhv7zh7a456iwwsb5vqrvjd0p871s2qi8lcd54fs1a";} - {name="kdegraphics-mobipocket";value="1ya4jzj864ikw6ysp9ip1ha2n6a8im380k4yhmca9agp5f21zvva";} - {name="kdegraphics-strigi-analyzer";value="1cwvaszjawzdbvggxzzaxvxdjpxmr9x4p4fqy4wq38qzx06lnsd1";} - {name="kdegraphics-thumbnailers";value="1zxvqzadmcsy5ydxx617gpfh3vswcrnyjwn19scy1cv7nwdpxnqj";} - {name="kdelibs";value="1wr0kadmc33kqbr93h05g6yxqwp66cgs9ab32danvqbfns0qgb15";} - {name="kdemultimedia";value="0h56vy27kb1s4p3vpa42gj3xjbpwl38n97bbjq7g1vj8dq2k0pl4";} - {name="kdenetwork";value="10lyrygi3avfiyaqxgw9g6dc3pmsbggawjvnkxhm8f2j2gy7sbbc";} - {name="kdepim";value="0q4fq26gg3hfmvxzfbizsa1ffk88a994k31ybbv72b7xcdjz68ff";} - {name="kdepimlibs";value="1wqi7dh1w3cinkd8sgc0zx9qf7fyvizli4asbimxh5faal1b10bb";} - {name="kdepim-runtime";value="1v1klgcfa0hwi7bxqn0nphd7hlbxwh3v6apghra0b8f7qqnzxysp";} - {name="kdeplasma-addons";value="1f4bpgrjqa9c1ikngc9wn3a0y0hw39icswc77ys4j04b9zazg8qn";} - {name="kde-runtime";value="0g2jlxfxm4flx1pr920hbmqaq433y8bdglk08vnhycychppkacmc";} - {name="kdesdk";value="15zg649sm851ig7yxcsv9cx54x36k94y83q1wvm1kf84jb1vl1yg";} - {name="kdetoys";value="038h6fmqfy7mh2i7kg3510w0jwji9hac94dpzfmfgk36i461dbnn";} - {name="kde-wallpapers";value="18hbd9d19yf48vs4vmxrrxvr87baxxlf3z417f69kgvjpvmpl905";} - {name="kdewebdev";value="1mv5nq8ayz5np1vmgk58dsai6wmqdl1kvq96pvi5awmhxxla2f5x";} - {name="kde-workspace";value="12vn117nbqxipvb58v7swc4prfddijz7m0c03xn5wi1kbzq5xj9n";} - {name="kdf";value="0alc9a7x75f8dx5gbhdqwn0xfx7kr5q7dl9qfmcmrgm9vn6agxpw";} - {name="kfloppy";value="0ajc3yq86n4q7hxjgibvkrbbagg7xnlbd6g7mx3cvmq9l7na105b";} - {name="kgamma";value="1yviy8xz8cqlbpvjj7sp9jylq4lk98r3mpp6lxl95ypkjqbjx8w3";} - {name="kgeography";value="0wklqqprg7d7mxjlwfyv4n5d2igkr6b2i174vxzdhj9dbsh9r67f";} - {name="kgpg";value="034mg0s5v0vqq59x1fwddslg6r2dx3v70icka6j2r9lhi8635j5m";} - {name="khangman";value="0b64pqywvxdxrbp3xcscimdlsn44hwlvm6ydxiwx2salm2rn9xxa";} - {name="kig";value="0cblkm71j78dq4r90r9fladn8nxq3xq75w40f85jl9dkmm1y3yiv";} - {name="kimono";value="1ij7bcvxv8zkfzcrmjasq6x0nf41104x5bj6ksfc8mibml182bq7";} - {name="kiten";value="1c3rdagddk0xd0j6vnp0bj16in78879niakvq1s35s7grgxh31ia";} - {name="klettres";value="0sxd3hwpzyzvjrvly0w2fwrssg4a9rs35fp9yi6in19x7x8rbsxl";} - {name="kmag";value="0fgddhsf9f5n4crzp4z2ii5p1asyvpbmsiqgb61kswqbpsr96mv8";} - {name="kmousetool";value="0f4ym6dihq9wmwaassap0ixam46lqjvf6jqkr6ib0y87myj3h9mi";} - {name="kmouth";value="1hpphlav8ip4kx3787p3dkfddkzpgg4mj25ripjcpy0xpbfvc2lw";} - {name="kmplot";value="19sab4hmdv8kwipgjzg4v3gq4lv1i17yh4hdq3y6lcyf7wjkxjpd";} - {name="kolourpaint";value="0mr4f1vbhg3vhap92f8jj5lkpfr8cjphn863vda49rfdydhv1x6w";} - {name="konsole";value="10fgjsq2dj56ifnzxy3dz87s92m2zfcmpqa751b5ar0wp3pil045";} - {name="korundum";value="0vkhf40ghbqgs9vxl7zpfq21r7sc9z4rm0iyl9cab04wvi9r2nsk";} - {name="kremotecontrol";value="11z0wc9yvpk72yrx9ic3zpky2z346wdkvs8qcik9nfbbxxpk4vnx";} - {name="kross-interpreters";value="0afqwxxsysd7wwl5xgwdw58q7hjr8y5sdvsfrz8sfkirinfdmp9s";} - {name="kruler";value="19xppbxvyw6qzgxz4y1yzz9g104464z1i7dvsd3919njqhsrm628";} - {name="ksaneplugin";value="0z2gkc0997s79haf2nxgg5xgvmpk5iz2s33147qhhy12hys6jq9m";} - {name="ksecrets";value="1f4n3x5rmc0l16q3bripk49mj0nyak6s3vf3v7j4g89qz8rr4c87";} - {name="ksnapshot";value="069v2qs4nl8514kdgcp6y03n1n4d6ymm5j5yq1wwrgij6iqc7a78";} - {name="kstars";value="1hl0z77cl317pm442lcd2hk6rb83hvch904a0jgflcxcd2w0gg54";} - {name="ktimer";value="1hf0sbl9y0a9w2xdxdl88lmv55skz7fp1kl9sgnsyj8gzjyv3nwa";} - {name="ktouch";value="00hij38zk469ja3ns9d7qpj91kyndwrnmf0v2fqd2nicv9mqxdih";} - {name="kturtle";value="0wvskx6cif0gsgvsc072i33jl58bp2n74vyl2qgbw4bibckp9aq8";} - {name="kwallet";value="1n4vl0gvr8sqh8ld0bmz3qdz8lws19vzndrp10xl5fmb40cibdsz";} - {name="kwordquiz";value="1w2xwfqz3bjmm0rg4pn08vgm7f0m1wr2bc8cwgjayc8105xy572h";} - {name="libkdcraw";value="0fpx8yprgrk6sg03xms8swgqb7b41ia2rnf9n5phm5hvbpwwbw9f";} - {name="libkdeedu";value="1nz53vjmd48x9vk73wrfz6k94drxv0w2nsa0nnh68q1mphxm8cz3";} - {name="libkexiv2";value="1w7h8ckq2b7pi6qdf8p7rk6jzpn5caxflzdczlaxa7jn84k4rsjn";} - {name="libkipi";value="02cdmqjky5sfwpz9m85yixkmcsh9ybjdspsi8dwhypndpq3pgj3w";} - {name="libksane";value="11wgzdccwix4whfdj8f7fyapxk9yp8jfra56s9gyn7a4sfgp40sp";} - {name="marble";value="09ph1lg3y6bzkxdnpwbhlysj9s56fbaxwsxpn2ydwg4vnsspspiy";} - {name="okular";value="06xd3xpm1hp2dk382p4sd2dj2gdwb1f4d97hkh67riddwwzlcdal";} - {name="oxygen-icons";value="0zw6kv456gf955ip28iykx8nmd4h0scpqdj4f035yqiyxms9p4g1";} - {name="parley";value="1mg5mkxlzrb1clnclsfcl4vpd8yn97asgcazlq9wmgr077z0f9yd";} - {name="perlkde";value="1k94rfchpi7nvzvwz2flx49ni92aw6x8cc6qnq1vr98j9hangjg4";} - {name="perlqt";value="0rjwd2d2jlqlsjvw6w198jb79kjib89p3gbslj4dfgblrq1cgrdq";} - {name="printer-applet";value="1y8r39dyc04bkqm33s65m77c6y4y19bi32v2cx5bl67w5377hvh0";} - {name="pykde4";value="0gnzqw2xj1swm2jr728fxb7l48ll8whvc4ranwcvx8920jdd8vk7";} - {name="qtruby";value="1ixb8kav1pxpkwar99p3cgwi6nql1dfjwmyq7ai2h8ls7g075gz8";} - {name="qyoto";value="07m64n9xlnpgmw6jj91vwyzzjnmwn9px3ckfi93qs4mgnsj263zi";} - {name="rocs";value="0zxdskps9ifc8yhrk6lngjsh4abp98pv7d9y48lw830jhy78bm57";} - {name="smokegen";value="08yzxg6x3bdpza7hld1bd1ils5ipav2laazcar811vsn70lr8rqy";} - {name="smokekde";value="1k8r7d82mbmilg2x565w9nwxb5x6xfznscqwv9vmsgync56nk982";} - {name="smokeqt";value="036128q7mz5701ikw7fjc22ygkmnlscckmlgv3nb8d914maa1cl0";} - {name="step";value="1i1334p7qlc84m8xjc4sp20pmnqal26y8854pcv7lh8r3xzyscd6";} - {name="superkaramba";value="05xgflb9ramhrqb6avqagxp1kcdax6qwdf1k6wm85l8ys6vjimry";} - {name="svgpart";value="0xrs93njmp5322m4dh3ycvwgl9p618kzsi5xmrnlksb9n0hi91gw";} - {name="sweeper";value="1gcyffzzap2gdxk3js43bllf87795f97i0lmykgyllhp364czv6x";} -]; -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-package/default.nix b/pkgs/desktops/kde-4.8/kde-package/default.nix deleted file mode 100644 index 8a6e8e16751..00000000000 --- a/pkgs/desktops/kde-4.8/kde-package/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, ignoreList, extraSubpkgs -}: - -let - inherit (stdenv.lib) filter fold; - inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; -in -rec { - manifest = import (./. + "/${release}.nix"); - - # src attribute for $name tarball - kdesrc = name: fetchurl { - url = "mirror://kde/" + (if manifest.stable then "" else "un") - + "stable/${release}/src/${name}-${release}.tar.xz"; - sha256 = getAttr name manifest.hashes; - }; - - # Default meta attribute - defMeta = { - homepage = http://www.kde.org; - platforms = stdenv.lib.platforms.linux; - inherit (qt4.meta) maintainers; - }; - - # KDE package built from the whole tarball - # This function is used both for monolithic modules and modules which are - # released as individual tarballs - kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc name; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" ])); - - # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs - # API. - kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; - - # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz - kdeSubdirPkg = module: - {name, subdir ? name, sane ? name}: - let name_ = name; in - a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc module; - cmakeFlags = - [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" - "-DBUILD_${subdir}=TRUE" - ] ++ cmakeFlags; - meta = defMeta // meta; - enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); - - # A KDE monolithic module - kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; - - # Combine packages in one module. - # Arguments: - # * pkgFun --- a function of the following signature: - # module: manifest_attrs: manual_attrs: derivation; - # * module --- name of the module - # * pkgs --- list of packages in manifest format - combinePkgs = pkgFun: module: pkgs: - let - f = p@{name, ...}: - callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; - list = map f pkgs; - attrs = listToAttrs (map - ({name, sane ? name, ...}@p: { name = sane; value = f p; }) - pkgs); - in - runCommand "${module}-${release}" - ({passthru = attrs // { - propagatedUserEnvPackages = list; - projects = attrs; - };}) - '' - mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages - ''; - - # Given manifest module data, return the module - kdeModule = { module, sane ? module, split, pkgs ? [] }: - let - pkgs_ = filterPkgs module pkgs; - in - # Module is splitted by upstream - if split then combinePkgs kdeSplittedPkg module pkgs_ - # Monolithic module - else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") - # Module is splitted by us - else combinePkgs kdeSubdirPkg module pkgs_; - - # The same, as nameValuePair with sane name - kdeModuleNV = a@{ module, sane ? module, ... }: - { name = sane; value = kdeModule a; }; - - filterPkgs = module: (p: - removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p - ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); - - # Remove attrsets with x.name in subst. Optimized for empty subst. - removeNames = subst: big: - fold (s: out: filter (x: x.name != s) out) big subst; - - modules = listToAttrs (map kdeModuleNV manifest.modules); - - splittedModuleList = - let - splitted = filter (a: a ? pkgs) manifest.modules; - names = map ({module, sane ? module, ...}: sane) splitted; - in - map (m: m.projects) (stdenv.lib.attrVals names modules); - - individual = - stdenv.lib.zipAttrsWith - ( - name: list: - if tail list == [] - then head list - else abort "Multiple modules define ${name}" - ) - splittedModuleList; -} diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh deleted file mode 100755 index e964ce3ddc1..00000000000 --- a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh +++ /dev/null @@ -1,146 +0,0 @@ -#! /bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir="$1" - -# Detect release number & whether it is a stable release -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.xz | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//') - -if [[ ${release##*.} -gt 50 ]]; then - stable="false" -else - stable="true" -fi - -echo "Detected release ${release}" >&2 - -declare -A hash -declare -A modules -declare -a packages -declare -a top_level - -# xsltproc output declares -A module -if [[ ! -f kde_projects.xml ]]; then - curl -O -J http://projects.kde.org/kde_projects.xml -fi -eval `xsltproc kde-submodules.xslt kde_projects.xml` - -module[kde-baseapps]=kde-baseapps -unset module[kactivities] - -print_sane() { - echo "Called print_sane $1" >&2 - sane="${1//[^a-z0-9_]/_}" - if [[ "$sane" != "$1" ]]; then - echo "Sane version is $sane" >&2 - echo -n "sane=\"$sane\";" - fi -} - -for i in `cd "${dir}"; ls *-${release}.tar.xz`; do - package=${i%-${release}.tar.xz} - packages+=( "$package" ) - echo -n "${package}.. " >&2 - hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo -n ${hash[$package]} >&2 - - if [ -n "${module[$package]}" ]; then - m="${module[$package]}" - echo " (${m})" >&2 - modules[$m]=1 - else - top_level+=( "$package" ) - echo " (top-level)" >&2 - fi - #nix-store --add-fixed sha256 "${dir}/${i}" >&2 -done - - -print_pkg_hash() { - echo " {name=\"${1}\";value=\"${hash[$1]}\";}" -} - -print_hashes(){ - echo "hashes=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo "];" -} - -print_split_module(){ - echo -n "$1:" >&2 - echo -e "{\n module=\"$1\";" - print_sane "$1" - echo " split=true;" - echo " pkgs=[" - for p in "${packages[@]}"; do - if [[ "${module[$p]}" == "$1" ]]; then - echo -n " { name=\"$p\"; " - print_sane "$p" - echo " }" - echo -n " $p" >&2 - fi - done - echo " ];" - echo "}" - echo >&2 -} - -print_mono_module(){ - echo -en "{ module=\"$1\"; " - print_sane "$1" - echo -n "$1 ... " >&2 - echo -n " split=false;" - cml="$1-$release/CMakeLists.txt" - tar -xf "${dir}/$1-${release}.tar.xz" "$cml" - if grep '^[^#]*add_subdirectory' $cml >/dev/null; then - if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then - echo " is monolithic (has unconditionally added subdirs)" >&2 - else - subdirs=( `grep '^[^#]*add_subdirectory' $cml | - sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | - grep -v '\(doc\|cmake\)'` ) - echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -e "\n pkgs=[" - for s in "${subdirs[@]}"; do - echo -en " {" - echo -n " name=\"${s//\//-}\"; " - print_sane "$s" - if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\"; " - fi - echo "}" - done - echo -e " ];\n" - fi - else - echo " is monolithic (has no subdirs)" >&2 - fi - rm $cml - rmdir $1-$release - echo "}" -} - -print_modules(){ - echo "modules=[" - echo "Printing modules splitted by upstream" >&2 - for m in "${!modules[@]}"; do print_split_module "$m"; done - echo >&2 - echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 - for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo "];" -} - -echo "Writing ${release}.nix" >&2 -exec > "${release}.nix" -echo "{stable=${stable};" -print_hashes -print_modules -echo "}" diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt deleted file mode 100644 index 952a05a9d27..00000000000 --- a/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- xslt file for http://projects.kde.org/kde_projects.xml --> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <xsl:output method="text" /> - <xsl:template match="/"> - <xsl:for-each select="kdeprojects/component[@identifier='kde']"> - <xsl:text>declare -A module </xsl:text> - <xsl:for-each select="module"> - <xsl:variable name="module" select='@identifier' /> - <xsl:for-each select=".//project[repo]"> - <xsl:text>module["</xsl:text> - <xsl:value-of select='@identifier' /> - <xsl:text>"]="</xsl:text> - <xsl:value-of select="$module" /> - <xsl:text>" </xsl:text> - </xsl:for-each> - </xsl:for-each> - </xsl:for-each> - </xsl:template> -</xsl:stylesheet> diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix deleted file mode 100644 index b8f9afff7b3..00000000000 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio -, networkmanager -}: - -kde { - buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager - samba libcanberra ntrack libjpeg qca2 pulseaudio - ]; - - nativeBuildInputs = [ pkgconfig ]; - - passthru.propagatedUserEnvPackages = [ virtuoso ]; - - meta = { - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix deleted file mode 100644 index ad4c22c632d..00000000000 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake }: - -kde { - nativeBuildInputs = [ cmake ]; - - patches = [ ./files/kde-wallpapers-buildsystem.patch ]; - - cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "b8dfcc905abc46eebac2dd07267879d6a27e6e77f5253eb9c65fe594766770c4"; - - meta = { - description = "Wallpapers for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix deleted file mode 100644 index 394cd550b96..00000000000 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, - lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, - pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities -}: - -kde { - - buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc - xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst - xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp - xorg.libpthreadstubs - boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate kdepimlibs pam prison akonadi - kactivities - ]; - - nativeBuildInputs = [ pkgconfig ]; - - preConfigure = - '' - # Fix incorrect path to kde4-config. - substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config - - # Fix the path to the keyboard configuration files. - substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ - --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 - ''; - - enableParallelBuilding = false; # frequent problems on Hydra - - meta = { - description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix deleted file mode 100644 index d38c80c4c36..00000000000 --- a/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Text-to-speech synthesis daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix deleted file mode 100644 index 98fae7c983f..00000000000 --- a/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Bridge that provides accessibility services to applications"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix deleted file mode 100644 index f3b27dacf67..00000000000 --- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Screen magnifier for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix deleted file mode 100644 index 8e0caa76ed9..00000000000 --- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst, libXt }: - -kde { - buildInputs = [ kdelibs libXtst libXt ]; - - meta = { - description = "A program that clicks the mouse for you"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix deleted file mode 100644 index 4159501967c..00000000000 --- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A type-and-say front end for speech synthesizers"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix deleted file mode 100644 index bada0c1cb10..00000000000 --- a/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix deleted file mode 100644 index bada0c1cb10..00000000000 --- a/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix deleted file mode 100644 index 571674a461a..00000000000 --- a/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; -} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix b/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix deleted file mode 100644 index 2c462f67c15..00000000000 --- a/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer, - kdelibs, kdepimlibs, pykde4, cups, nettools }: - -let s_c_p = system_config_printer.override { withGUI = false; }; in -kde { - buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip - pygobject s_c_p ]; - - passthru = { system_config_printer = s_c_p; }; - - preConfigure = - '' - for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do - substituteInPlace $i \ - --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \ - --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \ - --replace /bin/hostname ${nettools}/bin/hostname - done - ''; - - postInstall = - '' - # Bake the required Python path into the printer configuration program. - res= - for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done - - sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \ - -e "1 a import sys\nsys.path = [$res] + sys.path" - - mkdir -p $out/nix-support - echo ${pykde4} > $out/nix-support/propagated-user-env-packages - ''; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix deleted file mode 100644 index acccf66976f..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-color-schemes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE color schemes"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake deleted file mode 100644 index 499ed75268e..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake +++ /dev/null @@ -1,73 +0,0 @@ -#Macro to find xscreensaver directory - -# Copyright (c) 2006, Laurent Montel, <montel@kde.org> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (NOT XSCREENSAVER_FOUND) - FIND_PATH(XSCREENSAVER_DIR deco - HINTS - ${KDE4_INCLUDE_DIR} - PATHS - /usr - /usr/local - /opt/local - /usr/X11R6 - /opt/kde - /opt/kde3 - /usr/kde - /usr/local/kde - /usr/local/xscreensaver - /usr/openwin/lib/xscreensaver - /etc - PATH_SUFFIXES - lib${LIB_SUFFIX}/xscreensaver - lib${LIB_SUFFIX}/misc/xscreensaver - lib/xscreensaver - lib64/xscreensaver - lib/misc/xscreensaver - libexec/xscreensaver - bin/xscreensaver-hacks - hacks) - message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") - - FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml - PATHS - ${KDE4_INCLUDE_DIR} - /usr/ - /usr/local/ - /opt/local/ - /usr/X11R6/ - /opt/kde/ - /opt/kde3/ - /usr/kde/ - /usr/local/kde/ - /usr/openwin/lib/xscreensaver/ - /etc/ - PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config - ) - MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") - -endif(NOT XSCREENSAVER_FOUND) - -#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") -#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") - -# Need to fix hack -if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - set(XSCREENSAVER_FOUND TRUE) -endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - -if (XSCREENSAVER_FOUND) - if (NOT Xscreensaver_FIND_QUIETLY) - message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") - endif (NOT Xscreensaver_FIND_QUIETLY) -else (XSCREENSAVER_FOUND) - if (Xscreensaver_FIND_REQUIRED) - message(FATAL_ERROR "XScreenSaver not found") - endif (Xscreensaver_FIND_REQUIRED) -endif (XSCREENSAVER_FOUND) - - -MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix deleted file mode 100644 index edffca1562e..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers-high-resolution"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE wallpapers in high resolution"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix deleted file mode 100644 index 43071e8bd14..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kdeartwork-icon-themes"; - - # Sources contain primary and kdeclassic as well but they're not installed - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE nuvola and mono icon themes"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix deleted file mode 100644 index 947e5e17ab0..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-weather-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers (weather)"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix b/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix deleted file mode 100644 index 4bce95217cc..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "aurorae-themes"; - - buildInputs = [ kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix deleted file mode 100644 index 93dd361af73..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-desktop-themes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE desktop themes"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix deleted file mode 100644 index 5ef9f78a719..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-emotion-icons"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE emotion icons (smiles)"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix deleted file mode 100644 index 7028b9db228..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: - -kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - - nativeBuildInputs = [ pkgconfig ]; - - preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; - - cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; - - meta = { - description = "KDE screensavers"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix deleted file mode 100644 index b5d769b216d..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Styles for KWin"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix deleted file mode 100644 index e98705da889..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-sounds"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "New login/logout sounds"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/styles.nix b/pkgs/desktops/kde-4.8/kdeartwork/styles.nix deleted file mode 100644 index 6a1306c3710..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/styles.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-style-phase"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Phase, a widget style for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix deleted file mode 100644 index 611c6a70f6b..00000000000 --- a/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch deleted file mode 100644 index fd67860283b..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 48b92b74bc6fd270c33a726257e2879203cf5064 -Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com> -Date: Wed Mar 21 00:47:43 2012 +0400 - - Include SMOKE_QTCORE_INCLUDE_DIR - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48020a1..2263a73 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt - QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns - Phonon Qwt QSci QImageBlitz) - --include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src) -+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR}) - include(MacroOptionalFindPackage) - include(MacroOptionalAddBindings) diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch deleted file mode 100644 index c7f73815f54..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch +++ /dev/null @@ -1,118 +0,0 @@ -commit e702abfd16f610e773fb0310d8c6512991794c63 -Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com> -Date: Wed Mar 21 00:50:02 2012 +0400 - - Rewrite FindPerlMore.cmake - - * Ask perl for expanded paths - * Move execute_process to a macro - * Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX - - The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX - instead of perl install prefix.Add debug message - -diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake -index 6412a47..cc8faf8 100644 ---- a/cmake/FindPerlMore.cmake -+++ b/cmake/FindPerlMore.cmake -@@ -5,54 +5,52 @@ - # - # PERL_INCLUDE_PATH = path to where perl.h can be found - --if(PERL_INCLUDE_PATH) -- # Already in cache, be silent -- SET(PERL_HEADERS_FOUND TRUE) --endif (PERL_INCLUDE_PATH) -- --IF(PERL_EXECUTABLE) -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}" -- OUTPUT_VARIABLE PERL_ARCH_LIB_DIR) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}" -- OUTPUT_VARIABLE PERL_SITE_ARCH_DIR) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}" -- OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}" -- OUTPUT_VARIABLE PERL_SITE_LIB_DIR) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}" -- OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}" -- OUTPUT_VARIABLE PERL_VERSION) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}" -- OUTPUT_VARIABLE PERL_CXX_FLAGS) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}" -- OUTPUT_VARIABLE PERL_CCDL_FLAGS) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')" -- OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS) -- -- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}" -- OUTPUT_VARIABLE PERL_LIBS) -- -- FIND_PATH(PERL_INCLUDE_PATH -- NAMES perl.h -- PATHS ${PERL_ARCH_LIB_DIR}/CORE -- ) -- -- if(PERL_INCLUDE_PATH) -- SET(PERL_HEADERS_FOUND TRUE) -- endif (PERL_INCLUDE_PATH) -- -- MARK_AS_ADVANCED( -- PERL_INCLUDE_PATH -- ) -+if(FIND_PERLMORE_REQUIRED) -+ find_package(Perl REQUIRED) -+else() -+ find_package(Perl) -+endif() -+ -+macro(_perl_get_config_var name output) -+ execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}" -+ OUTPUT_VARIABLE PERL_${output}) -+endmacro() -+ -+macro(_perl_get_config_dir name) -+ string(TOLOWER ${name} _tmp) -+ string(REPLACE "_" "" _tmp ${_tmp}) -+ _perl_get_config_var(${_tmp}exp ${name}_DIR) -+ string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}") -+endmacro() -+ -+if(PERL_EXECUTABLE) -+ _perl_get_config_var(prefixexp ROOT_DIR) -+ -+ _perl_get_config_dir(ARCH_LIB) -+ _perl_get_config_dir(SITE_ARCH) -+ _perl_get_config_dir(VENDOR_ARCH) -+ _perl_get_config_dir(SITE_LIB) -+ _perl_get_config_dir(VENDOR_LIB) -+ -+ _perl_get_config_var(version VERSION) -+ _perl_get_config_var(ccflags CXX_FLAGS) -+ _perl_get_config_var(ccdlflags CCDL_FLAGS) -+ -+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')" -+ OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS) -+ -+ _perl_get_config_var(perllibs LIBS) -+ -+ FIND_PATH(PERL_INCLUDE_PATH -+ NAMES perl.h -+ HINTS ${PERL_ARCH_LIB_DIR}/CORE -+ ) -+ -+ if(PERL_INCLUDE_PATH) -+ SET(PERL_HEADERS_FOUND TRUE) -+ endif (PERL_INCLUDE_PATH) -+ -+ MARK_AS_ADVANCED(PERL_INCLUDE_PATH) - ENDIF(PERL_EXECUTABLE) - - IF(PERL_HEADERS_FOUND) diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch deleted file mode 100644 index 04f0c558677..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch +++ /dev/null @@ -1,454 +0,0 @@ -commit c78779fcaff587818ee37bec3ded5e0617625b95 -Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com> -Date: Wed Mar 21 01:01:27 2012 +0400 - - Install to PERL_SITE_ARCH_INSTALL_DIR - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48020a1..16188df 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/ - add_definitions(-DDEBUG) - - include (FindPerlMore) --set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension") - - # the RPATH to be used when installing, but only if it's not a system directory - GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH) -diff --git a/INSTALL b/INSTALL -index d19f97e..97cc9f1 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -36,7 +36,6 @@ ccmake step. - The standard options are: - CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc) - CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 ) -- CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves. - QT_QMAKE_EXECUTABLE = The path to your system's qmake. - - cmake looks in your path for a qmake executable. If it can't find it, it will -diff --git a/Makefile.PL b/Makefile.PL -index df9a13c..31dd912 100755 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -3,7 +3,7 @@ - use strict; - use Config; - --my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch}); -+my ($prefix, $qmake) = ($Config{prefix}); - my @cmakeArgs; - foreach my $arg (@ARGV) { - my $key = $arg; -@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) { - $value =~ s/^[^=]*=//g; - if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') { - $prefix = $value; -- $sitearch = "$prefix"; - } - elsif ($key eq 'QMAKE') { - $qmake = $value; -@@ -34,7 +33,6 @@ if($^O =~ /win/i){ - } - push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix; - push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake; --push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch; - push @args, @cmakeArgs; - - if ( eval "require Alien::SmokeQt" ) { -diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt -index f2857c3..78674ea 100644 ---- a/phonon/lib/CMakeLists.txt -+++ b/phonon/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm) --install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt -index a04db11..9933dfd 100644 ---- a/phonon/src/CMakeLists.txt -+++ b/phonon/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon - set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_phonon PROPERTIES PREFIX "") - --install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt -index 0809ba8..22fc1c0 100644 ---- a/qimageblitz/lib/CMakeLists.txt -+++ b/qimageblitz/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm) --install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt -index 02ef494..4f02c1b 100644 ---- a/qimageblitz/src/CMakeLists.txt -+++ b/qimageblitz/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz - set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qimageblitz PROPERTIES PREFIX "") - --install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt -index 63b451f..d22869f 100644 ---- a/qsci/lib/CMakeLists.txt -+++ b/qsci/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm) --install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt -index 8c1659b..bdcb5a8 100644 ---- a/qsci/src/CMakeLists.txt -+++ b/qsci/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci - set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qsci PROPERTIES PREFIX "") - --install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt -index 2f04cfa..dda5afa 100644 ---- a/qt3support/lib/CMakeLists.txt -+++ b/qt3support/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm) --install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt -index b24532e..bed99aa 100644 ---- a/qt3support/src/CMakeLists.txt -+++ b/qt3support/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4 - set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qt3support4 PROPERTIES PREFIX "") - --install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt -index ef07d10..1d78196 100644 ---- a/qtcore/lib/CMakeLists.txt -+++ b/qtcore/lib/CMakeLists.txt -@@ -1,3 +1,3 @@ - add_subdirectory( QtCore4 ) - add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm) --install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} ) -+install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} ) -diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt -index 44c7893..06aef20 100644 ---- a/qtcore/lib/QtCore4/CMakeLists.txt -+++ b/qtcore/lib/QtCore4/CMakeLists.txt -@@ -1,3 +1,3 @@ --install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 ) -+install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 ) - add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4) - add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4) -diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt -index 3910636..b5e645c 100644 ---- a/qtcore/src/CMakeLists.txt -+++ b/qtcore/src/CMakeLists.txt -@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4 - set_target_properties(perlqtcore4 PROPERTIES - OUTPUT_NAME ${libraryName} - PREFIX "" -- INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/ -+ INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/ - ) - --install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) - install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h - marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h - QtCore4.h smokehelp.h smokeperl.h util.h -diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt -index d03a672..a60d603 100644 ---- a/qtdbus/lib/CMakeLists.txt -+++ b/qtdbus/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm) --install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt -index 9aa05a0..5786ea2 100644 ---- a/qtdbus/src/CMakeLists.txt -+++ b/qtdbus/src/CMakeLists.txt -@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4 - set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4") - set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/) -+install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/) -diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt -index e8d2847..b458858 100644 ---- a/qtdeclarative/lib/CMakeLists.txt -+++ b/qtdeclarative/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm) --install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt -index 1662167..ec2a8fc 100644 ---- a/qtdeclarative/src/CMakeLists.txt -+++ b/qtdeclarative/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4 - set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt -index 82626c8..e62a4ac 100644 ---- a/qtgui/lib/CMakeLists.txt -+++ b/qtgui/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm) --install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt -index 4cc8b36..44041b6 100644 ---- a/qtgui/src/CMakeLists.txt -+++ b/qtgui/src/CMakeLists.txt -@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4 - set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtgui4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt -index dcf5ebe..da817d4 100644 ---- a/qthelp/lib/CMakeLists.txt -+++ b/qthelp/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm) --install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt -index c00359d..689cb29 100644 ---- a/qthelp/src/CMakeLists.txt -+++ b/qthelp/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4 - set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qthelp4 PROPERTIES PREFIX "") - --install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt -index e55f697..5384539 100644 ---- a/qtmultimedia/lib/CMakeLists.txt -+++ b/qtmultimedia/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm) --install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt -index 0728aba..df8e552 100644 ---- a/qtmultimedia/src/CMakeLists.txt -+++ b/qtmultimedia/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4 - set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt -index 12cd5dd..d1fb0e6 100644 ---- a/qtnetwork/lib/CMakeLists.txt -+++ b/qtnetwork/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm) --install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt -index caf8327..0994d57 100644 ---- a/qtnetwork/src/CMakeLists.txt -+++ b/qtnetwork/src/CMakeLists.txt -@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4 - set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt -index f3b5640..d8dc9e4 100644 ---- a/qtopengl/lib/CMakeLists.txt -+++ b/qtopengl/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm) --install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt -index 20493a9..777af89 100644 ---- a/qtopengl/src/CMakeLists.txt -+++ b/qtopengl/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4 - set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt -index d21dbe5..320ff93 100644 ---- a/qtscript/lib/CMakeLists.txt -+++ b/qtscript/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm) --install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt -index dd395be..6ff47d8 100644 ---- a/qtscript/src/CMakeLists.txt -+++ b/qtscript/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4 - set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtscript4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt -index 59336d3..d9dd4d5 100644 ---- a/qtsql/lib/CMakeLists.txt -+++ b/qtsql/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm) --install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt -index 3ec2028..59096ba 100644 ---- a/qtsql/src/CMakeLists.txt -+++ b/qtsql/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4 - set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtsql4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt -index 33f6deb..bf1dc1f 100644 ---- a/qtsvg/lib/CMakeLists.txt -+++ b/qtsvg/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm) --install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt -index 11eccd2..449bf0f 100644 ---- a/qtsvg/src/CMakeLists.txt -+++ b/qtsvg/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4 - set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt -index 3bfa78c..5a8d8da 100644 ---- a/qttest/lib/CMakeLists.txt -+++ b/qttest/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm) --install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt -index 5492e55..d4662b1 100644 ---- a/qttest/src/CMakeLists.txt -+++ b/qttest/src/CMakeLists.txt -@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4 - set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qttest4 PROPERTIES PREFIX "") - --install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt -index 119e40e..3a5f472 100644 ---- a/qtuitools/lib/CMakeLists.txt -+++ b/qtuitools/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm) --install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt -index a8ae4a2..ecc079f 100644 ---- a/qtuitools/src/CMakeLists.txt -+++ b/qtuitools/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4 - set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt -index a02f7ee..3846227 100644 ---- a/qtwebkit/lib/CMakeLists.txt -+++ b/qtwebkit/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm) --install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt -index a6e00f8..dbebc44 100644 ---- a/qtwebkit/src/CMakeLists.txt -+++ b/qtwebkit/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4 - set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt -index 5505bc4..7db743c 100644 ---- a/qtxml/lib/CMakeLists.txt -+++ b/qtxml/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm) --install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt -index 018508c..a351609 100644 ---- a/qtxml/src/CMakeLists.txt -+++ b/qtxml/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4 - set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtxml4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt -index a35f3df..3d86103 100644 ---- a/qtxmlpatterns/lib/CMakeLists.txt -+++ b/qtxmlpatterns/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm) --install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt -index 9970a98..563e922 100644 ---- a/qtxmlpatterns/src/CMakeLists.txt -+++ b/qtxmlpatterns/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4 - set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "") - --install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) -diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt -index 0013c4d..d67ffbf 100644 ---- a/qwt/lib/CMakeLists.txt -+++ b/qwt/lib/CMakeLists.txt -@@ -1,2 +1,2 @@ - add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm) --install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) -+install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) -diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt -index 869d818..b644e80 100644 ---- a/qwt/src/CMakeLists.txt -+++ b/qwt/src/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt - set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName}) - set_target_properties(perl_qwt PROPERTIES PREFIX "") - --install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) -+install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix deleted file mode 100644 index f2b5462f33e..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, smokeqt, perl }: - -kde { - buildInputs = [ smokeqt perl ]; - nativeBuildInputs = [ cmake ]; - - patches = - # The order is important - [ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch - ./perlqt-use-site-arch-install-dir.patch - ]; - - meta = { - description = "Perl bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch deleted file mode 100644 index e7a7cb4c661..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt -index 41fa0fe..642d867 100644 ---- a/kpythonpluginfactory/CMakeLists.txt -+++ b/kpythonpluginfactory/CMakeLists.txt -@@ -3,7 +3,12 @@ - set(kpythonpluginfactory_SRCS - kpythonpluginfactory.cpp) - --GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME) -+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF) -+if(HARDCODE_LIB_PYTHON_PATH) -+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH) -+else(HARDCODE_LIB_PYTHON_PATH) -+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME) -+endif(HARDCODE_LIB_PYTHON_PATH) - ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\") - ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) - diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch deleted file mode 100644 index 96b3b887a8d..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch +++ /dev/null @@ -1,91 +0,0 @@ -commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 -Author: Luca Beltrame <lbeltrame@kde.org> -Date: Mon Oct 1 20:47:56 2012 +0200 - - Remove duplicated QVector<int> definition, since it's in PyQt now. - Simon, if you have time, please review if everything is OK. - - CCMAIL: simon@simonzone.com - -diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip -index 5a0a080..73dad01 100644 ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -951,77 +951,3 @@ template <TYPE1> - %End - }; - --%MappedType QVector<int> --{ --%TypeHeaderCode --#include <qvector.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) -- { -- int t = (sipCpp->at(i)); -- --#if PY_MAJOR_VERSION >= 3 -- PyObject *tobj = PyLong_FromLong(t); --#else -- PyObject *tobj = PyInt_FromLong(t); --#endif -- -- PyList_SET_ITEM(l, i, tobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); --#if PY_MAJOR_VERSION >= 3 -- if (!PyNumber_Check(tobj)) --#else -- if (!PyInt_Check(tobj)) --#endif -- return 0; -- } -- return 1; -- } -- -- QVector<int> *qv = new QVector<int>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); -- #if PY_MAJOR_VERSION >= 3 -- int t = PyLong_AsLong (tobj); --#else -- int t = PyInt_AS_LONG (tobj); --#endif -- -- if (*sipIsErr) -- { -- delete qv; -- return 0; -- } -- -- qv->append(t); -- } -- -- *sipCppPtr = qv; -- -- return sipGetState(sipTransferObj); --%End --}; diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix deleted file mode 100644 index eb4d49616c4..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - boost, lndir }: - -let pydir = "lib/python${python.majorVersion}"; in - -kde { - buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ]; - - propagatedBuildInputs = [ pyqt4 sip ]; - - patches = [ ./pykde4-hardcode-lib-python.patch ./pykde4-new-sip.patch ]; - - cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; - - preConfigure = - '' - # Symlink PyQt into PyKDE. This is necessary because PyQt looks - # in its PyQt4/uic/widget-plugins directory for plugins, and KDE - # needs to install a plugin. - mkdir -pv $out/${pydir} - ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} - cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" ) - ''; - - meta = { - description = "Python bindings for KDE"; - kde.name = "pykde4"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch deleted file mode 100644 index 7d20a3c1c0b..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33078b4..1a6ad2e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "") - find_package(Ruby REQUIRED) - find_package(Qt4 REQUIRED) - find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt) --include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES}) -+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES}) - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR}) - include(MacroOptionalFindPackage) diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch deleted file mode 100644 index bd95a0d8bd3..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33078b4..30aec0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY) - return() - endif (NOT COMPILE_RUBY) - --SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" ) --SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR}) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR}) - - # compute an overall version number which can be compared at once - MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix deleted file mode 100644 index 723732f6104..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, smokeqt, ruby }: - -kde { - buildInputs = [ smokeqt ruby ]; - nativeBuildInputs = [ cmake ]; - - # The second patch is not ready for upstream submmission. I should add an - # option() instead. - patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ]; - - cmakeFlags="-DRUBY_ROOT_DIR=${ruby}"; - - meta = { - description = "Ruby bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch deleted file mode 100644 index 03df484b63e..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79945c4..a244d0f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,10 +32,6 @@ set(generator_SRC - type.cpp - ) - --# force RPATH so that the binary is usable from within the build tree --set (CMAKE_SKIP_BUILD_RPATH FALSE) --set (CMAKE_SKIP_RPATH FALSE) -- - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) - - add_executable(smokegen ${generator_SRC}) -diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in -index 947315c..de8d66c 100644 ---- a/cmake/SmokeConfig.cmake.in -+++ b/cmake/SmokeConfig.cmake.in -@@ -44,21 +44,19 @@ macro (find_smoke_component name) - set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "") - - find_path(SMOKE_${uppercase}_INCLUDE_DIR -- ${lowercase}_smoke.h -- PATH ${SMOKE_INCLUDE_DIR} -- NO_DEFAULT_PATH -+ ${lowercase}_smoke.h -+ HINTS ${SMOKE_INCLUDE_DIR} -+ PATH_SUFFIXES smoke - ) - if(WIN32) - # DLLs are in the bin directory. - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} -- PATHS "@CMAKE_INSTALL_PREFIX@/bin" -- NO_DEFAULT_PATH) -+ PATHS "@CMAKE_INSTALL_PREFIX@/bin") - else(WIN32) - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - endif(WIN32) - - if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY) diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix deleted file mode 100644 index 8b5da2a641d..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, qt4, cmake }: - -kde { - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - patches = [ ./smokegen-nix.patch ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix deleted file mode 100644 index 0e823a95e3b..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }: - -kde { - # attica, akonadi and kdepimlibs are disabled due to smokegen crash - buildInputs = [ smokeqt kdelibs shared_desktop_ontologies ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines"; - meta = { - description = "SMOKE bindings for kdelibs"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix deleted file mode 100644 index 29e25093d11..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: - -kde { - propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = [ smokegen ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/analitza.nix b/pkgs/desktops/kde-4.8/kdeedu/analitza.nix deleted file mode 100644 index 74c3a1ebb20..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/analitza.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, readline }: -kde { - buildInputs = [ kdelibs readline ]; - - meta = { - description = "Library part of KAlgebra"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/blinken.nix b/pkgs/desktops/kde-4.8/kdeedu/blinken.nix deleted file mode 100644 index cdf9728833c..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/blinken.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Memory Enhancement Game"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/cantor.nix b/pkgs/desktops/kde-4.8/kdeedu/cantor.nix deleted file mode 100644 index 8b8bbc210c7..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/cantor.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libspectre }: -kde { - buildInputs = [ kdelibs libspectre ]; - - meta = { - description = "KDE Frontend to Mathematical Software"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix deleted file mode 100644 index 3675c3a225f..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu, analitza }: -kde { - buildInputs = [ kdelibs libkdeedu analitza ]; - - meta = { - description = "2D and 3D Graph Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix deleted file mode 100644 index 69ab5dfc473..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }: -kde { - buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - - meta = { - description = "Periodic Table of Elements"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix deleted file mode 100644 index 8759c96d78c..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Letter Order Game"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix deleted file mode 100644 index dc50f1e85a3..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Practice Fractions"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix deleted file mode 100644 index bd8d27c8d6e..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Geography Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/khangman.nix b/pkgs/desktops/kde-4.8/kdeedu/khangman.nix deleted file mode 100644 index 997b50e906a..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/khangman.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "KDE hangman game"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kig.nix b/pkgs/desktops/kde-4.8/kdeedu/kig.nix deleted file mode 100644 index bd5ef67529c..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kig.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, boost, python}: -kde { - buildInputs = [ kdelibs boost python ]; - - cmakeFlags = '' - -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix} - -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1 - ''; - meta = { - description = "KDE Interactive Geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kiten.nix b/pkgs/desktops/kde-4.8/kdeedu/kiten.nix deleted file mode 100644 index 939b7a9f77a..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kiten.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Japanese Reference/Study Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/klettres.nix b/pkgs/desktops/kde-4.8/kdeedu/klettres.nix deleted file mode 100644 index 7a0fa83078e..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/klettres.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE alphabet tutorial"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix deleted file mode 100644 index 18458cf6f0b..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE mathematical function plotter"; - kde = { - name = "kmplot"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kstars.nix b/pkgs/desktops/kde-4.8/kdeedu/kstars.nix deleted file mode 100644 index 5b5a2d621de..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kstars.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, eigen, xplanet, indilib }: - -kde { - buildInputs = [ kdelibs eigen xplanet indilib ]; - - meta = { - description = "A KDE graphical desktop planetarium"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix deleted file mode 100644 index 768be6f4367..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Touch Typing Tutor"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix deleted file mode 100644 index 1e1922b1410..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Educational Programming Environment"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix deleted file mode 100644 index 1b33ba2e469..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu }: - -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Flash Card Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix deleted file mode 100644 index def6c85fefe..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Libraries used by KDE Education applications"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/marble.nix b/pkgs/desktops/kde-4.8/kdeedu/marble.nix deleted file mode 100644 index 8bd86c91094..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/marble.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gpsd }: - -kde { - buildInputs = [ kdelibs gpsd ]; - - meta = { - description = "Marble Virtual Globe"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/parley.nix b/pkgs/desktops/kde-4.8/kdeedu/parley.nix deleted file mode 100644 index eccd40a598f..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/parley.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu, libxml2, attica }: - -kde { - buildInputs = [ kdelibs libkdeedu libxml2 attica ]; - - meta = { - description = "Vocabulary Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/rocs.nix b/pkgs/desktops/kde-4.8/kdeedu/rocs.nix deleted file mode 100644 index 91976b84001..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/rocs.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ]; - - NIX_CFLAGS_COMPILE = "-fexceptions"; - - meta = { - description = "A KDE graph theory viewer"; - kde = { - name = "rocs"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeedu/step.nix b/pkgs/desktops/kde-4.8/kdeedu/step.nix deleted file mode 100644 index fac9974baf1..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/step.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gsl, libqalculate, eigen }: - -kde { - buildInputs = [ kdelibs gsl libqalculate eigen ]; - - meta = { - description = "A KDE interactive physical simulator"; - kde = { - name = "step"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegames.nix b/pkgs/desktops/kde-4.8/kdegames.nix deleted file mode 100644 index dfca49be12f..00000000000 --- a/pkgs/desktops/kde-4.8/kdegames.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, - openal, libsndfile, qhull, sqlite, pkgconfig }: - -kde rec { - buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython - openal libsndfile qhull sqlite ] ++ pythonPath; - - pythonPath = [ pythonPackages.twisted pykde4 ]; - - nativeBuildInputs = [ pkgconfig ]; - - # TODO: ggz - - postInstall = "wrapPythonPrograms"; - - meta = { - description = "KDE Games"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix deleted file mode 100644 index c03c82469e6..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi -, libjpeg, pkgconfig }: - -kde { - - buildInputs = - [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Gwenview, the KDE image viewer"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix deleted file mode 100644 index 70904b17c23..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libgphoto2 }: - -kde { - buildInputs = [ kdelibs libgphoto2 ]; - - meta = { - description = "KDE camera interface library"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix deleted file mode 100644 index 58528cb186b..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A small utility to select a color"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix deleted file mode 100644 index 2c2ba3796a2..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, okular }: - -kde { - buildInputs = [ kdelibs okular ]; - - meta = { - description = "A collection of plugins to handle mobipocket files"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix deleted file mode 100644 index 6001a5f363d..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for various graphics file formats"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix deleted file mode 100644 index 55bf8309b2a..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libkexiv2, libkdcraw }: - -kde { - buildInputs = [ kdelibs libkexiv2 libkdcraw ]; - - meta = { - description = "Thumbnailers for various graphics file formats"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix deleted file mode 100644 index 28d9252187e..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libXxf86vm }: - -kde { - buildInputs = [ kdelibs libXxf86vm ]; - - meta = { - description = "KDE monitor calibration tool"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix deleted file mode 100644 index 5276ec09f46..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - meta = { - description = "KDE paint program"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix deleted file mode 100644 index c5c2c6e05d7..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE screen ruler"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix deleted file mode 100644 index 1381ed7dd26..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libksane }: - -kde { - buildInputs = [ kdelibs libksane ]; - - meta = { - description = "A KScan plugin that implements the scanning through libksane"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix deleted file mode 100644 index f01a609e20d..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libkipi }: - -kde { - buildInputs = [ kdelibs libkipi ]; - - meta = { - description = "KDE screenshot utility"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix deleted file mode 100644 index 9810a98551e..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libjpeg, lcms1 }: - -kde { - buildInputs = [ kdelibs libjpeg lcms1 ]; - - meta = { - description = "Library for decoding RAW images"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix deleted file mode 100644 index 096b0a6e957..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, exiv2 }: - -kde { - buildInputs = [ kdelibs exiv2 ]; - - meta = { - description = "Exiv2 support library"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix deleted file mode 100644 index 6b16265e7a3..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Interface library to kipi-plugins"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix deleted file mode 100644 index b539eab3899..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, saneBackends }: - -kde { - buildInputs = [ kdelibs saneBackends ]; - - meta = { - description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix deleted file mode 100644 index 0c5c7b49b17..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 -, qimageblitz, pkgconfig }: - -kde { - buildInputs = - [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ]; - - meta = { - description = "Okular, the KDE document viewer"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix deleted file mode 100644 index a344cc4b4b4..00000000000 --- a/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "SVG KPart"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix deleted file mode 100644 index 0e7c9cfdbea..00000000000 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ kde, gcc, cmake, perl -, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver -, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, libjpeg, xz -}: - -kde { - buildInputs = - [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper - libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies xz udev libxml2 libjpeg kerberos - ]; - - propagatedBuildInputs = [ qt4 soprano strigi phonon ]; - - propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; - - # TODO: make sonnet plugins (dictionaries) really work. - # There are a few hardcoded paths. - # Let kdelibs find openexr - # Split plugins from libs? - - patches = [ ./files/polkit-install.patch ]; - - # cmake fails to find acl.h because of C++-style comment - # TODO: OpenEXR - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - ]; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdemultimedia.nix b/pkgs/desktops/kde-4.8/kdemultimedia.nix deleted file mode 100644 index 09efeb336dc..00000000000 --- a/pkgs/desktops/kde-4.8/kdemultimedia.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, - libmusicbrainz3, libtunepimp, pulseaudio }: - -kde { - - buildInputs = - [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg - flac lame pulseaudio - ]; - - meta = { - description = "KDE multimedia programs such as a movie player and volume utility"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake deleted file mode 100644 index c40b0bed310..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# cmake macro to test msiLBC - -# Copyright (c) 2009-2010 Pali Rohár <pali.rohar@gmail.com> -# -# MSILBC_FOUND -# MSILBC_LIBRARY - -include ( FindPackageHandleStandardArgs ) - -if ( MSILBC_LIBRARY ) - set ( MSILBC_FOUND true ) - set ( msiLBC_FIND_QUIETLY true ) -else ( MSILBC_LIBRARY ) - find_library ( MSILBC_LIBRARY NAMES msilbc - PATH_SUFFIXES mediastreamer/plugins) -endif ( MSILBC_LIBRARY ) - -find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY ) -mark_as_advanced ( MSILBC_LIBRARY ) diff --git a/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix deleted file mode 100644 index 2f32f4d6b2c..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch deleted file mode 100644 index ebadbfad9ba..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt ---- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400 -+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400 -@@ -28,7 +28,8 @@ - set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} ) - endif (WIN32) - --find_package(KdepimLibs REQUIRED) -+macro_optional_find_package(KdepimLibs) -+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete") - # find_package(X11VidMode) not used at this time - - # NX support is not ready for KDE 4.2; disabled (uwolfer) -@@ -79,7 +80,9 @@ - macro_optional_add_subdirectory(kfile-plugins) - macro_optional_add_subdirectory(kget) - --macro_optional_add_subdirectory(kopete) -+if(KDEPIMLIBS_FOUND) -+ macro_optional_add_subdirectory(kopete) -+endif(KDEPIMLIBS_FOUND) - - if(Q_WS_X11) - macro_optional_add_subdirectory(krdc) diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix deleted file mode 100644 index 2f32f4d6b2c..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix deleted file mode 100644 index f90fd356079..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - name = "strigi-analyzer-torrent"; - - buildInputs = [ kdelibs boost ]; - - preConfigure = "mv -v strigi-analyzer kfile-plugins"; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix deleted file mode 100644 index 2381a2459e6..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite -, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: - -kde { - buildInputs = - [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs - kde_baseapps gpgme boost libmms qca2 sqlite - ]; - - KDEDIRS = libktorrent; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix deleted file mode 100644 index d1d9f0c8e03..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, - jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, - libgadu, boost, qca2, gpgme, sqlite }: - -kde { - buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent - jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 - gpgme sqlite ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - patchPhase = - '' - cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake - ''; - - cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; - - meta = { - description = "A KDE multi-protocol IM client"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix deleted file mode 100644 index 2f32f4d6b2c..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix deleted file mode 100644 index 40ef91d5433..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libvncserver, libjpeg }: - -kde { - buildInputs = [ kdelibs libvncserver libjpeg ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix deleted file mode 100644 index 80013f430d3..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst }: - -kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix deleted file mode 100644 index ef637f3f075..00000000000 --- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, fetchurl, cmake, kdelibs, libxml2, libxslt, boost, kdepimlibs, akonadi -, shared_desktop_ontologies }: - -kde { - buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2 - libxslt ]; - - meta = { - description = "KDE PIM runtime"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdepim.nix b/pkgs/desktops/kde-4.8/kdepim.nix deleted file mode 100644 index 6d99a801d1c..00000000000 --- a/pkgs/desktops/kde-4.8/kdepim.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime -, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison }: - -kde { - - buildInputs = - [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2 - libxslt cyrus_sasl gpgme libassuan grantlee prison - ]; - - passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; - - meta = { - description = "KDE PIM tools"; - longDescription = '' - Contains various personal information management tools for KDE, such as an organizer. - ''; - license = "GPL"; - homepage = http://pim.kde.org; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdepimlibs.nix b/pkgs/desktops/kde-4.8/kdepimlibs.nix deleted file mode 100644 index 736508eaf0f..00000000000 --- a/pkgs/desktops/kde-4.8/kdepimlibs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info -, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }: - -kde { - buildInputs = - [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt - openldap cyrus_sasl akonadi prison - ]; - - propagatedBuildInputs = [ kdelibs ]; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix deleted file mode 100644 index a69002bff28..00000000000 --- a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig -, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz -, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt }: -# TODO: qwt, scim - -kde { - - KDEDIRS=marble; - - buildInputs = [ kdelibs boost eigen kde_workspace - attica python qca2 qimageblitz kdepimlibs libdbusmenu_qt - libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "KDE Plasma Addons"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix deleted file mode 100644 index 1dabe46cd42..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE CVS frontend"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix deleted file mode 100644 index 8032b89ff54..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn plugin for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix deleted file mode 100644 index df4a0856c6b..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Git plugin for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix deleted file mode 100644 index 8032b89ff54..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn plugin for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix deleted file mode 100644 index 8032b89ff54..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn plugin for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch deleted file mode 100644 index f6f4df942dd..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake -index 59bcb96..2eac05d 100644 ---- a/cmake/modules/FindSVN.cmake -+++ b/cmake/modules/FindSVN.cmake -@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS - FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS - /usr/local/apr/bin - ) -+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS -+ /usr/local/apr/bin -+) - - if(SVNCONFIG_EXECUTABLE) - -@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) - else(APRCONFIG_EXECUTABLE) - FIND_PATH(_INCLUDES apr_pools.h -- ${SVN_INCLUDES}/apr-0/ -- ${SVN_INCLUDES}/apr-1/ -- ${SVN_INCLUDES}/apr-1.0/ -- /usr/include/apr-0/ -- /usr/include/apr-1/ -- /usr/include/apr-1.0/ -- /usr/local/include/apr-0/ -- /usr/local/include/apr-1/ -- /usr/local/include/apr-1.0/ -+ HINTS ${SVN_INCLUDES} -+ SUFFIXES apr-0 apr-1 apr-1.0 - ) - if(_INCLUDES) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_FOUND FALSE) # no apr == can't compile! - endif(_INCLUDES) - endif(APRCONFIG_EXECUTABLE) -+ -+ # Use apu-config if it exists -+ if(APUCONFIG_EXECUTABLE) -+ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) -+ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) -+ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(APUCONFIG_EXECUTABLE) -+ FIND_PATH(_INCLUDES apu.h -+ HINTS ${SVN_INCLUDES} -+ SUFFIXES apr-0 apr-1 apr-1.0 -+ ) -+ if(_INCLUDES) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(_INCLUDES) -+ set(SVN_FOUND FALSE) # no apr == can't compile! -+ endif(_INCLUDES) -+ endif(APUCONFIG_EXECUTABLE) - FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) - if(SVN_LIBRARIES) - FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix deleted file mode 100644 index 391536248dd..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE 4 project template generator"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix deleted file mode 100644 index 65d410cca48..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Frontend for Callgrind/Cachegrind"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix deleted file mode 100644 index 7e170ca2a2c..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "KDE accounts akonadi agent"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix deleted file mode 100644 index 6a10bdf7c4b..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, perl }: - -kde { - buildInputs = [ kdelibs perl ]; - - cmakeFlags = [ "-DBUILD_perldoc=ON" ]; - - meta = { - description = "perldoc: kioslave"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix deleted file mode 100644 index db0bd27094b..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, subversionClient, apr, aprutil }: - -kde { - buildInputs = [ kdelibs subversionClient apr aprutil ]; - - patches = [ ./find-svn.patch ]; - - meta = { - description = "Subversion kioslave"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix b/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix deleted file mode 100644 index d580f7fb691..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, gcc }: - -kde { - buildInputs = [ kdelibs ]; - - preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; - - meta = { - description = "KDE mtrace-based malloc debugger"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kompare.nix b/pkgs/desktops/kde-4.8/kdesdk/kompare.nix deleted file mode 100644 index 1ddb4b8ea5b..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kompare.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A program to view the differences between files and optionally generate a diff"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix b/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix deleted file mode 100644 index e7790d33c90..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A test application for KParts"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix b/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix deleted file mode 100644 index 5a6693f2f5d..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A macro for profiling using QTime"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix b/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix deleted file mode 100644 index 0c8259cd31f..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libtool }: - -kde { - buildInputs = [ kdelibs libtool ]; - - meta = { - description = "Measures start up time of a KDE application"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix b/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix deleted file mode 100644 index 7c5089dcd37..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Displays Qt Designer's UI files"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix deleted file mode 100644 index 1565426eb1f..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, hunspell }: - -kde { - buildInputs = [ kdelibs hunspell ]; - - meta = { - description = "KDE 4 Computer-aided translation system"; - longDescription = '' - Computer-aided translation system. - Do not translate what had already been translated. - ''; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/okteta.nix b/pkgs/desktops/kde-4.8/kdesdk/okteta.nix deleted file mode 100644 index 058636596ad..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/okteta.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, qca2 }: - -kde { - buildInputs = [ kdelibs qca2 ]; - -# TODO: Look what does -DBUILD_mobile add - - enableParallelBuilding = false; - - meta = { - description = "KDE byte editor"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/poxml.nix b/pkgs/desktops/kde-4.8/kdesdk/poxml.nix deleted file mode 100644 index 1ab9ed49df5..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/poxml.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, antlr }: - -kde { - buildInputs = [ kdelibs antlr ]; - - meta = { - description = "Po<->xml tools"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/scripts.nix b/pkgs/desktops/kde-4.8/kdesdk/scripts.nix deleted file mode 100644 index df81145e5d6..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/scripts.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Various scripts to ease KDE development"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix deleted file mode 100644 index 0ad48c8cfde..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for diff, po and ts"; - kde = { - name = "strigi-analyzer"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix deleted file mode 100644 index e83a2d9a901..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, boost }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt boost ]; - - meta = { - description = "Umbrello UML modeller"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdetoys/amor.nix b/pkgs/desktops/kde-4.8/kdetoys/amor.nix deleted file mode 100644 index 936d63d544a..00000000000 --- a/pkgs/desktops/kde-4.8/kdetoys/amor.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE creature for your desktop"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix deleted file mode 100644 index dacf54def4b..00000000000 --- a/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE utility for making a fine cup of tea"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdetoys/ktux.nix b/pkgs/desktops/kde-4.8/kdetoys/ktux.nix deleted file mode 100644 index 108f9be7c72..00000000000 --- a/pkgs/desktops/kde-4.8/kdetoys/ktux.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Tux Screen Saver"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/ark.nix b/pkgs/desktops/kde-4.8/kdeutils/ark.nix deleted file mode 100644 index 7fbdaf586d6..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/ark.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libarchive, bzip2, kde_baseapps }: - -kde { - buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ]; - - meta = { - description = "KDE Archiving Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/filelight.nix b/pkgs/desktops/kde-4.8/kdeutils/filelight.nix deleted file mode 100644 index 25ecabed27c..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/filelight.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Tool to visualise file and directory sizes"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix deleted file mode 100644 index 08b202e8f0e..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gmp }: - -kde { - buildInputs = [ kdelibs gmp ]; - - meta = { - description = "KDE Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix deleted file mode 100644 index d4c9c06f483..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE character selection utility"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kdf.nix b/pkgs/desktops/kde-4.8/kdeutils/kdf.nix deleted file mode 100644 index 3f9da58d0a6..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kdf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE free disk space utility"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix deleted file mode 100644 index 2434a4fa671..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Floppy disk formatting utility"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix deleted file mode 100644 index f3b00a5b968..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "Simple KDE GUI for GPG"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix deleted file mode 100644 index fef516e478d..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace, libXtst }: - -kde { - buildInputs = [ kdelibs kde_workspace libXtst ]; - - meta = { - description = "KDE remote control"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix deleted file mode 100644 index 5700977349e..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Timer"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix deleted file mode 100644 index 9ec0e6c0396..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Wallet (password storage) management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix b/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix deleted file mode 100644 index 2d937b3a4db..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ kde, kdelibs -, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer -, pythonDBus, makeWrapper }: - -let s_c_p = system_config_printer.override { withGUI = false; }; in - -kde rec { - buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython - ] ++ pythonPath; - - pythonPath = [ pyqt4 pykde4 pycups s_c_p ]; - - passthru.propagatedUserEnvPackages = [ s_c_p ]; - - postInstall = - '' - wrapPythonPrograms - - # ‘system-config-printer’ supplies some D-Bus policy that we need. - mkdir -p $out/nix-support - echo ${s_c_p} > $out/nix-support/propagated-user-env-packages - ''; - - meta = { - description = "KDE printer applet"; - longDescription = "Applet to view current print jobs and configure new printers"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix deleted file mode 100644 index 4dce768078b..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; - - meta = { - description = "A KDE Eye-candy Application"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix deleted file mode 100644 index 78d56c7df30..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Helps clean unwanted traces the user leaves on the system"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix deleted file mode 100644 index c3f6129d7e5..00000000000 --- a/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt ]; - - meta = { - description = "Batch search and replace tool"; - homepage = http://www.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix deleted file mode 100644 index bececea7797..00000000000 --- a/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt ]; - - meta = { - description = "An HTML imagemap editor"; - homepage = http://www.nongnu.org/kimagemap/; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix deleted file mode 100644 index 94adbb7fd6e..00000000000 --- a/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs -, boost, htmlTidy }: - -kde { - buildInputs = - [ kdelibs libxml2 libxslt kdepimlibs boost htmlTidy ]; - - meta = { - description = "A KDE link checker"; - homepage = http://klinkstatus.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix deleted file mode 100644 index 6a870e56303..00000000000 --- a/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt ]; - - meta = { - description = "A graphical editor of scripted dialogs"; - }; -} diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix deleted file mode 100644 index c9fab80bffb..00000000000 --- a/pkgs/desktops/kde-4.8/l10n/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, stable }: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz"; - name = "${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ gettext kdelibs ]; - - cmakeFlags = "-Wno-dev"; - - meta = { - description = "KDE translation for ${lang}"; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; - inherit (kdelibs.meta) maintainers homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh deleted file mode 100755 index ec159a1e204..00000000000 --- a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do - lang=${i%-${release}.tar.xz} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix deleted file mode 100644 index fb823440abd..00000000000 --- a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix +++ /dev/null @@ -1,277 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1s17fypvwbr7v2jz1cdmxcgyav8ggj6sjiamvxdb9c6waahhmpjv"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1lpdd4h9xgssvd5srkiyfzl7ngiyq7pipjm896qfmz03j3yzbwnz"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "0g6f5nihxizixc17y92453b4gj6w0bfwk4kndg2z60in9m4cswz5"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "02har0kybcj2jj51lxkrm6akr9dmv0afrxmzggbrbhfglhln8221"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "06wcfrbq1yh1vmzcyn7klym9cvmk8p56b23k9nbgw129z0ylhqxx"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "14kn3xq62fxn138gkc63icmngl97vb1bkmqv93cscbr4zc5sfkvw"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "10h3crypajdrxghn3hwprsgm09dblwsr17pg99c03zs4cd3gyv6s"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "1pp5d3s1450wf1kwawj9n3gv4pgr32dh3nnvkl5n58wjq07b9ah7"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1wkp2v8yspgyixyki962vb3y8qdkdlp9mkrvfbw8lr6w2ivhkd90"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "07qw1qinlndfdkz2dzdr9bbb9kqxqhq3ya1qmcz999bw3ggjyi25"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0wfl76s3zdb29dckbds63cfi96v2v59f6cm9yzjhwn87kyicq7k1"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "04ip1493m35qdv9f42590r1zqf9g6cksqzp6n7xcfzi1lr0cipyv"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "1pisn8myphk38jym2i8rp60rnvh3jn8lxnjghf5ng7h6ac1ydki3"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "1vx01f0i8mcxzbizn32hpl737bgih73qnsysvzl6cdv06ckvxrmm"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "1gx78cc294xnq2n96br2ahr2p6jzgv9d7bbaf9rm4nsamzbdd5m6"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "0skvnga1xavx10l3hhyqdr0mfapnjnbh75pbjvibg96d7wzxxi23"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1pqcxhsgca3c5h9i9jpx67b572r3nhxrd6zmpkhidp3b476j2fx4"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "03k0w0byra36krrm8gbfmfv7am74y85zy6n01nl3j4xgiy41yqy4"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "0llqgsp9nw92px54lidsgdx5mk6z5nivshs4p193iplypa1pcfck"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "0w8l6msbxmjg889kpprh3bfzbgks2abp30b0m6xn43jkrghghxsj"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "0j63m00ilk9k5dy12bp3ndrwk5vcz79pwqhj9znp9l077lr1ah5n"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "0d3nkv9kbh6rdaf46psy2iia1phkj49xf67cdmnhr8kqgh557vh6"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1gq4asqwsayd7wgkyqqg93lhqa8m0ac35as4dlrbqph4rk56k54y"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "05l9d9xmf08nr14gjsl8qbqyn8xc3qji4wc4zsqnmnp2fk8l3ndd"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "0hhl7pdfs1kcmz18k08961xq7y5vvjkwwzibkg238xagjq6wh1wl"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1ipf5y1vy5accxbxs74641iqs785n2nkgxy31lgcm0ay0s6y3kx4"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "1arhyqn4yarcff3zhpi7a0c26b0rr1k3dwds9r6vq383vmv5la4a"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1ny008qwxpdl9l4a56y664hxb3y0c9i5rpbbwnpcmynm6fmnm1ik"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "0aimxflnbx716bdph6snfzw17kkqqsbxrxawgjwmdp69h02pj5zh"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "14np3z28z946mf1g93ci202mqmg3qlgi1wlv8yp7949lq36psfx2"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "1jqxyih3m9p0km610dmpv9c3nzxjfm2aga1lm7nz3akgb8n6lhdi"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "000lmksgcinsxr5ny607b2q4h108pk4jzyygrf38zpw02crsa0i5"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0spg23ngm8lj7bkbcj0s62i22flqzwvnhg12ghkiyqrdg8v725hq"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "1qpdabq9clbb6r59gs7s0k3l1rb5fxvbhsasxsw1r7m4l32gnlib"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1nfkwmic4vs287ywi0mrqw95fvy42xdaxrsafxhjwdxqiynq6z66"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "078m4ph7kcjvkbivhaa54wdqr8fz8qa8r8db76w1wlynwgqy4qfs"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "1vcgkikbq48kxcgpi0vp95gj3wgfmghrvr6gqhlfql19wp5mjvm8"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "04pjxaxllhhccwinn33ild0xjjn05wqb3a660xhf3cgr6wkgx02f"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1bb2f14h73ba35ysl3snnbiawx2ciz8h80f80k76qnyxix6zk885"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1gm22h89j0s91gdnpn8nf0zw761ddwj5wg5i58v8aza45dh026rx"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "13hmbpsvzxiz4ci29388crr8xwhqmbrgs3yn12ay6z8fcwi3v528"; -} -{ - lang = "si"; - saneName = "si"; - sha256 = "0557m5r07xdqc0ambzw7b5kqnjaxyx6si2w2zi804gx89cjkjzyn"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "0yy379i8hy37sq61xz3n9309srjgm46n8jhj5dqf120jfc4knp2m"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "03qk82hz3zdaj1rcpfyrzks4ss6rrqfwz1wkjqp1rrm5g7kl835w"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1dz2ckc7h7sm8ac66ajpypfifkpnx94d5d24hsm9gnp271x3134a"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0rynj1db0yijlb2ilwzia53h2xqaj5prz4ap0y06vpw5i84xf6f5"; -} -{ - lang = "tg"; - saneName = "tg"; - sha256 = "0s78pb4b6fkqwvn9hp0n2mb6jkdwnx3hfh7vs9dxdx3m7zpgjq9z"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "0xf646xnyjkwa5m32chsnsbb5ndfvbrzgc7i76g2fwp843wrn4rq"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0bfawc1cp9f7q1cq69y0w9bwawh2f4bhl1795f0i171pvfmmwq9g"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "1lj7kjmfjk6micrspkpzx4jhskw33zi7jyshfz8i8234vzzn9j6d"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "09ssi2zx24cfwc4bm039i9p6si8cx22fqwisi356ijjclrb3k7sh"; -} -{ - lang = "vi"; - saneName = "vi"; - sha256 = "0sc3mjbi7gsyllgkqck75qgnfdmrlqh5ffmxl2p4q8m1whkgxqr1"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "06rfw2l812gf3zyw7kl500lxda751q3bhrl7dh67zsc4s18gy9cb"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "1zaxjza3q5ana63kqm9mbqssz73my07iikfq2w0i29naqx570p0y"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "1svp8ykbcssl028hn6vxb6yb5agkbzlzvxnm6imkillsvmqlchdj"; -} -] diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix deleted file mode 100644 index 52e5e5f6bb0..00000000000 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "3984dac79aa7398578bcd9d69d74988bd992807518d46cd1dabc03867044c8a4"; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "KDE Oxygen theme icons"; - longDescription = "Icons for KDE's default theme"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix deleted file mode 100644 index 9a9e8a87066..00000000000 --- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: - -stdenv.mkDerivation rec { - name = "akonadi-1.7.2"; - - src = fetchurl { - url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "07rbhc8aa3d896j2r64ljv3amd6s4xhlbgq7kx99m1f68yl1fwjb"; - }; - - buildInputs = [ qt4 soprano libxslt boost ]; - - nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe6e56bdb7..e26eac4a5f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9353,14 +9353,6 @@ let kde4 = recurseIntoAttrs pkgs.kde410; - kde48 = kdePackagesFor (pkgs.kde48 // { - boost = boost149; - eigen = eigen2; - libotr = libotr_3_2; - libgphoto2 = libgphoto2_4; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.8; - kde410 = kdePackagesFor (pkgs.kde410 // { boost = boost149; eigen = eigen2; |