From 5008f2dba66c6b7453beb698fffe3a018a6c3a79 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:50 +0000 Subject: [PATCH] add enchant support to kdelibs svn path=/nixpkgs/trunk/; revision=21610 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/libs/default.nix | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index d0fc470473c..f2e1b4029d2 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -61,7 +61,7 @@ pkgs.recurseIntoAttrs (rec { kdelibs = import ./libs { 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 - kerberos acl attr shared_desktop_ontologies; + kerberos acl attr shared_desktop_ontologies enchant; inherit (pkgs.xlibs) libXScrnSaver; inherit automoc4 phonon strigi soprano qca2 attica polkit_qt; }; diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 896c444d10e..280bb2214a1 100644 --- a/pkgs/desktops/kde-4.4/libs/default.nix +++ b/pkgs/desktops/kde-4.4/libs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, lib, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , 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 { name = "kdelibs-4.4.2"; - + src = fetchurl { url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2; sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15"; @@ -15,16 +15,15 @@ stdenv.mkDerivation { buildInputs = [ 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 - libXScrnSaver + libXScrnSaver enchant automoc4 phonon strigi soprano qca2 attica polkit_qt ]; propagatedBuildInputs = [ shared_desktop_ontologies ]; - - # I don't know why cmake does not find the acl files (but finds attr files) + # cmake fails to find acl.h because of C++-style comment cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ]; - + meta = { description = "KDE libraries"; license = "LGPL";