public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add enchant support to kdelibs

Browse Source 
svn path=/nixpkgs/trunk/; revision=21610
This commit is contained in:
Yury G. Kudryashov 2010-05-05 18:17:50 +00:00
parent 320ce20929
commit 5008f2dba6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.4/default.nix
View File

@ -61,7 +61,7 @@ pkgs.recurseIntoAttrs (rec {
kdelibs = import ./libs { kdelibs = import ./libs {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
kerberos acl attr shared_desktop_ontologies; kerberos acl attr shared_desktop_ontologies enchant;
inherit (pkgs.xlibs) libXScrnSaver; inherit (pkgs.xlibs) libXScrnSaver;
inherit automoc4 phonon strigi soprano qca2 attica polkit_qt; inherit automoc4 phonon strigi soprano qca2 attica polkit_qt;
}; };

11
pkgs/desktops/kde-4.4/libs/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, lib, perl { stdenv, fetchurl, cmake, lib, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt , automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt, enchant
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdelibs-4.4.2"; name = "kdelibs-4.4.2";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2; url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2;
sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15"; sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15";
@ -15,16 +15,15 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
libXScrnSaver libXScrnSaver enchant
automoc4 phonon strigi soprano qca2 attica polkit_qt automoc4 phonon strigi soprano qca2 attica polkit_qt
]; ];
propagatedBuildInputs = [ shared_desktop_ontologies ]; propagatedBuildInputs = [ shared_desktop_ontologies ];
# cmake fails to find acl.h because of C++-style comment
# I don't know why cmake does not find the acl files (but finds attr files)
cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ]; cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ];
meta = { meta = {
description = "KDE libraries"; description = "KDE libraries";
license = "LGPL"; license = "LGPL";