From 87e357c1673b39377967a79a6fee9c6b00317d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jan 2010 00:15:22 +0000 Subject: [PATCH] Enabling ACLs in kdelibs. Not in the cleanest way, but I wrote a comment about the hack. svn path=/nixpkgs/trunk/; revision=19496 --- pkgs/desktops/kde-4.3/default.nix | 2 +- pkgs/desktops/kde-4.3/libs/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 3298408c5bab..48ba9fc65a32 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -57,7 +57,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; + kerberos acl attr; inherit automoc4 phonon strigi soprano; }; diff --git a/pkgs/desktops/kde-4.3/libs/default.nix b/pkgs/desktops/kde-4.3/libs/default.nix index 3f5f2d5ab50a..c37bda037128 100644 --- a/pkgs/desktops/kde-4.3/libs/default.nix +++ b/pkgs/desktops/kde-4.3/libs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, lib, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, flex, bison, openexr, aspell, avahi, kerberos +, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr , automoc4, phonon, strigi, soprano }: @@ -16,9 +16,12 @@ 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 + shared_mime_info giflib jasper /* openexr */ aspell avahi kerberos acl attr automoc4 phonon strigi soprano ]; + + # 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" ]; meta = { description = "KDE libraries";