From 08f6682666ee5b07b01e8b0354cf936da3d0c6bf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 09:22:33 +0000 Subject: KDE-4.7: build with qt-4.8 svn path=/nixpkgs/trunk/; revision=32392 --- pkgs/desktops/kde-4.7/default.nix | 9 ++++++--- .../kde-4.7/files/kde-wallpapers-buildsystem.patch | 17 +++++++++++++++++ pkgs/desktops/kde-4.7/kde-wallpapers.nix | 7 +++++-- pkgs/desktops/kde-4.7/kde-workspace.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix | 4 ++-- pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdegames.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix | 7 +++++-- pkgs/desktops/kde-4.7/kdelibs.nix | 2 +- pkgs/desktops/kde-4.7/kdemultimedia.nix | 5 +++-- pkgs/desktops/kde-4.7/kdenetwork/kget.nix | 6 +++--- pkgs/desktops/kde-4.7/kdenetwork/kopete.nix | 4 ++-- pkgs/desktops/kde-4.7/kdenetwork/krdc.nix | 4 ++-- pkgs/desktops/kde-4.7/l10n/default.nix | 4 ++-- 14 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 3bdf825410c..428e1370635 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt47 }: +{ callPackage, callPackageOrig, stdenv, qt48 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt47; + qt4 = qt48; kdebase_workspace = kde.modules.kde_workspace; @@ -52,5 +52,8 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; - l10n = callPackage ./l10n { inherit release; }; + l10n = callPackage ./l10n { + inherit release; + inherit (kde.manifest) stable; + }; } diff --git a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch new file mode 100644 index 00000000000..378cdb64694 --- /dev/null +++ b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d3e247..f78db67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,10 @@ +-find_package(KDE4 REQUIRED) +-include(KDE4Defaults) ++project(kde-wallpapers NONE) ++if( WALLPAPER_INSTALL_DIR ) ++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") ++else() ++ find_package(KDE4 REQUIRED) ++ include(KDE4Defaults) ++endif() + + install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) + diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix index 60298e567fb..97773ffadcd 100644 --- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.7/kde-wallpapers.nix @@ -1,8 +1,11 @@ -{ kde, kdelibs }: +{ kde, cmake }: kde { + buildNativeInputs = [ cmake ]; - buildInputs = [ kdelibs ]; + patches = [ ./files/kde-wallpapers-buildsystem.patch ]; + + cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 55c243f60dd..fe51032f757 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,13 +1,13 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, - pykde4 + pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: kde { buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 + [ 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 @@ -15,6 +15,8 @@ kde { libusb python libqalculate consolekit kdepimlibs pam prison akonadi ]; + buildNativeInputs = [ pkgconfig ]; + preConfigure = '' # Fix incorrect path to kde4-config. diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix index 42306049c5d..8e0caa76ed9 100644 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix +++ b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libXtst }: +{ kde, kdelibs, libXtst, libXt }: kde { - buildInputs = [ kdelibs libXtst ]; + buildInputs = [ kdelibs libXtst libXt ]; meta = { description = "A program that clicks the mouse for you"; diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix index cc195c8de90..72676e35f71 100644 --- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix @@ -1,7 +1,9 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }: +{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ]; + buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; + + buildNativeInputs = [ pkgconfig ]; preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix index 3378a99d9e7..03ecfbd88b4 100644 --- a/pkgs/desktops/kde-4.7/kdegames.nix +++ b/pkgs/desktops/kde-4.7/kdegames.nix @@ -1,12 +1,14 @@ { kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, - openal, libsndfile, qhull }: + openal, libsndfile, qhull, sqlite, pkgconfig }: kde rec { buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython - openal libsndfile qhull ] ++ pythonPath; + openal libsndfile qhull sqlite ] ++ pythonPath; pythonPath = [ pythonPackages.twisted pykde4 ]; + buildNativeInputs = [ pkgconfig ]; + # TODO: ggz postInstall = "wrapPythonPrograms"; diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix index efc2707e7d6..b6b659c3947 100644 --- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix @@ -1,9 +1,12 @@ -{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }: +{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi +, libjpeg, pkgconfig }: kde { buildInputs = - [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ]; + [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; + + buildNativeInputs = [ pkgconfig ]; meta = { description = "Gwenview, the KDE image viewer"; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index d4383b3e93a..106909ac3db 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -11,7 +11,7 @@ kde { [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 libjpeg + shared_desktop_ontologies udev xz libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.7/kdemultimedia.nix b/pkgs/desktops/kde-4.7/kdemultimedia.nix index b4ca7a8d2da..4c3182dd9fe 100644 --- a/pkgs/desktops/kde-4.7/kdemultimedia.nix +++ b/pkgs/desktops/kde-4.7/kdemultimedia.nix @@ -1,5 +1,5 @@ { kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, - libmusicbrainz3, libtunepimp }: + libmusicbrainz3, libtunepimp, pulseaudio }: kde { @@ -7,7 +7,8 @@ kde { # Note: kdemultimedia can use xine-lib, but it doesn't seem useful # without the Phonon Xine backend. [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg - flac lame ]; + flac lame pulseaudio + ]; meta = { description = "KDE multimedia programs such as a movie player and volume utility"; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix index 33d9ec1ca01..2381a2459e6 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, - shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: +{ 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 + kde_baseapps gpgme boost libmms qca2 sqlite ]; KDEDIRS = libktorrent; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix index a4b01c5f9a6..704f6d04dfe 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix @@ -1,11 +1,11 @@ { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, - libgadu, boost, qca2, gpgme }: + 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 ]; + gpgme sqlite ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix index 664b1bc45a7..40ef91d5433 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libvncserver }: +{ kde, kdelibs, libvncserver, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver ]; + buildInputs = [ kdelibs libvncserver libjpeg ]; patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix index 144968f6672..69cfdcf8ab2 100644 --- a/pkgs/desktops/kde-4.7/l10n/default.nix +++ b/pkgs/desktops/kde-4.7/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release }: +{ stdenv, fetchurl, kdelibs, gettext, release, stable }: let @@ -11,7 +11,7 @@ let name = "kde-l10n-${saneName}-${release}"; src = fetchurl { - url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; + url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; name = "${name}.tar.bz2"; inherit sha256; }; -- cgit 1.4.1