From 51e05493985100ce0c17584e163347232764a537 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Sep 2009 13:04:14 +0000 Subject: [PATCH] - Added oxygen icons, which are mandatory for KDE 4.3 - Updated DJVU libre to 3.5.22 - Updated KDE graphics, artwork, games to 4.3.1 - Poppler Qt4 backend now uses QT-4.5.x svn path=/nixpkgs/trunk/; revision=17006 --- pkgs/applications/misc/djvulibre/default.nix | 6 ++--- pkgs/desktops/kde-4.3/artwork/default.nix | 17 ++++++++++---- pkgs/desktops/kde-4.3/default.nix | 14 +++++++---- pkgs/desktops/kde-4.3/games/default.nix | 14 +++++++---- pkgs/desktops/kde-4.3/graphics/default.nix | 23 +++++++++++++------ .../desktops/kde-4.3/oxygen-icons/default.nix | 16 +++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 7 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 pkgs/desktops/kde-4.3/oxygen-icons/default.nix diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index c2fb0810ba9..59c4552b7b3 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,11 +1,11 @@ args: with args; stdenv.mkDerivation { - name = "djvulibre-3.5.21"; + name = "djvulibre-3.5.22"; src = fetchurl { - url = mirror://sourceforge/djvu/djvulibre-3.5.21.tar.gz; - sha256 = "39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4"; + url = mirror://sourceforge/djvu/djvulibre-3.5.22.tar.gz; + sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix"; }; buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa]; diff --git a/pkgs/desktops/kde-4.3/artwork/default.nix b/pkgs/desktops/kde-4.3/artwork/default.nix index 8c8b67053b5..8003b540bbc 100644 --- a/pkgs/desktops/kde-4.3/artwork/default.nix +++ b/pkgs/desktops/kde-4.3/artwork/default.nix @@ -1,13 +1,20 @@ -{stdenv, fetchurl, cmake, qt4, perl, xscreensaver, - kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: +{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver +, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: stdenv.mkDerivation { - name = "kdeartwork-4.2.4"; + name = "kdeartwork-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeartwork-4.2.4.tar.bz2; - sha1 = "601fa04bc6fb9bdd5dfa094af04ad204bcc20b14"; + url = mirror://kde/stable/4.3.1/src/kdeartwork-4.3.1.tar.bz2; + sha1 = "9db5c69723bdc9f203e4f854d505c0f87a6dda0d"; }; includeAllQtDirs=true; buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; + meta = { + description = "KDE artwork"; + longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers"; + license = "LGPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 37a5887a90f..306ceec0db6 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -73,12 +73,16 @@ rec { }; kdebase_runtime = import ./base-runtime { - inherit (pkgs) stdenv fetchurl cmake lib perl bzip2 xz qt4; + inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4; inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore; inherit kdelibs; inherit automoc4 phonon strigi soprano; }; + oxygen_icons = import ./oxygen-icons { + inherit (pkgs) stdenv fetchurl lib cmake; + }; + ### ADDITIONAL kdepimlibs = import ./pimlibs { @@ -95,7 +99,7 @@ rec { }; kdeartwork = import ./artwork { - inherit (pkgs) stdenv fetchurl cmake qt4 perl xscreensaver; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl xscreensaver; inherit kdelibs kdebase_workspace; inherit automoc4 phonon strigi eigen; }; @@ -108,8 +112,8 @@ rec { }; kdegraphics = import ./graphics { - inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends libgphoto2; - inherit (pkgs) libspectre djvulibre chmlib; + inherit (pkgs) stdenv fetchurl lib cmake perl qt4 exiv2 lcms saneBackends libgphoto2; + inherit (pkgs) libspectre djvulibre chmlib shared_mime_info; inherit (pkgs.xlibs) libXxf86vm; poppler = pkgs.popplerQt4; inherit kdelibs; @@ -146,7 +150,7 @@ rec { }; kdegames = import ./games { - inherit (pkgs) stdenv fetchurl cmake qt4 perl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; inherit kdelibs; inherit automoc4 phonon qca2; }; diff --git a/pkgs/desktops/kde-4.3/games/default.nix b/pkgs/desktops/kde-4.3/games/default.nix index 587854eaaa4..30bee4b8699 100644 --- a/pkgs/desktops/kde-4.3/games/default.nix +++ b/pkgs/desktops/kde-4.3/games/default.nix @@ -1,11 +1,17 @@ -{stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: +{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: stdenv.mkDerivation { - name = "kdegames-4.2.4"; + name = "kdegames-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdegames-4.2.4.tar.bz2; - sha1 = "c940d73616734fabdfcd0c5961459ba168494b16"; + url = mirror://kde/stable/4.3.1/src/kdegames-4.3.1.tar.bz2; + sha1 = "576255ce66a0c089e0840bd90ea89d5705872bc8"; }; includeAllQtDirs=true; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ]; + meta = { + description = "KDE Games"; + homepage = http://www.kde.org; + license = "GPL"; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/graphics/default.nix b/pkgs/desktops/kde-4.3/graphics/default.nix index cd3bce0f85c..d697283ba00 100644 --- a/pkgs/desktops/kde-4.3/graphics/default.nix +++ b/pkgs/desktops/kde-4.3/graphics/default.nix @@ -1,15 +1,24 @@ -{stdenv, fetchurl, cmake, perl, qt4, exiv2, lcms, saneBackends, libgphoto2, - libspectre, poppler, djvulibre, chmlib, libXxf86vm, - kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: +{ stdenv, fetchurl, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2 +, libspectre, poppler, djvulibre, chmlib, shared_mime_info, libXxf86vm +, kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: stdenv.mkDerivation { - name = "kdegraphics-4.2.4"; + name = "kdegraphics-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdegraphics-4.2.4.tar.bz2; - sha1 = "032352e87be16ae90f09183a466e61487ef1e738"; + url = mirror://kde/stable/4.3.1/src/kdegraphics-4.3.1.tar.bz2; + sha1 = "d57d9007b95607c0ee925cc963d7e14798fc69f9"; }; includeAllQtDirs=true; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib - stdenv.gcc.libc libXxf86vm + shared_mime_info stdenv.gcc.libc libXxf86vm kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ]; + meta = { + description = "KDE graphics utilities"; + longDescription = '' + Contains various graphics utilities such as the Gwenview image viewer and + Okular a document reader. + ''; + license = "GPL"; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/oxygen-icons/default.nix b/pkgs/desktops/kde-4.3/oxygen-icons/default.nix new file mode 100644 index 00000000000..c88c68b0323 --- /dev/null +++ b/pkgs/desktops/kde-4.3/oxygen-icons/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, lib, cmake}: + +stdenv.mkDerivation { + name = "oxygen-icons-4.3.1"; + src = fetchurl { + url = mirror://kde/stable/4.3.1/src/oxygen-icons-4.3.1.tar.bz2; + sha1 = "75a82d2e80d946333f63e32db56767c3ed17ba33"; + }; + buildInputs = [ cmake ]; + meta = { + description = "KDE Oxygen theme icons"; + longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3"; + license = "GPL"; + maintainers = [ lib.maintainers.sander ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e197a05a0f..efeb11d60a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3989,8 +3989,9 @@ let }; popplerQt4 = import ../development/libraries/poppler { - inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg + inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg pkgconfig; + qt4 = qt45; inherit (gtkLibs) glib gtk; qt4Support = true; };