* Added Okular (which is a separate package now).
svn path=/nixpkgs/branches/kde-4.7/; revision=27723
This commit is contained in:
parent
a7b9ef8f4b
commit
dce69134d0
@ -1,12 +1,12 @@
|
|||||||
{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
|
{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
|
||||||
, libungif, zlib, x11, libX11, mesa, qt3 }:
|
, libungif, zlib, x11, libX11, mesa, qt3 }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "djvulibre-3.5.22";
|
name = "djvulibre-3.5.24";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/djvu/djvulibre-3.5.22.tar.gz;
|
url = "mirror://sourceforge/djvu/${name}.tar.gz";
|
||||||
sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
|
sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
|
buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
|
||||||
|
@ -49,6 +49,8 @@ recurseIntoAttrs rec {
|
|||||||
|
|
||||||
### OTHER MODULES
|
### OTHER MODULES
|
||||||
|
|
||||||
|
okular = callPackage ./okular.nix { };
|
||||||
|
|
||||||
kdeaccessibility = combinePkgs "kdeaccessibility" {
|
kdeaccessibility = combinePkgs "kdeaccessibility" {
|
||||||
colorSchemes = callPackage ./accessibility/color-schemes.nix { };
|
colorSchemes = callPackage ./accessibility/color-schemes.nix { };
|
||||||
iconThemes = callPackage ./accessibility/icon-themes.nix { };
|
iconThemes = callPackage ./accessibility/icon-themes.nix { };
|
||||||
|
16
pkgs/desktops/kde-4.7/okular.nix
Normal file
16
pkgs/desktops/kde-4.7/okular.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
|
||||||
|
, popplerQt4, qca2, qimageblitz, qt4 }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
|
||||||
|
buildInputs =
|
||||||
|
[ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
|
||||||
|
qca2 qimageblitz qt4
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Okular, the KDE document viewer";
|
||||||
|
license = "GPLv2";
|
||||||
|
kde.name = "okular";
|
||||||
|
};
|
||||||
|
}
|
@ -7,10 +7,12 @@ in
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "${pn}-${v}";
|
name = "${pn}-${v}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
|
url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
|
||||||
sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
|
sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 ];
|
buildInputs = [ cmake qt4 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user