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

Enabling ACLs in kdelibs. Not in the cleanest way, but I wrote a comment about the hack.

Browse Source 
svn path=/nixpkgs/trunk/; revision=19496
This commit is contained in:
Lluís Batlle i Rossell 2010-01-17 00:15:22 +00:00
parent 9b5743ceac
commit 87e357c167
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,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; kerberos acl attr;
inherit automoc4 phonon strigi soprano; inherit automoc4 phonon strigi soprano;
}; };

7
pkgs/desktops/kde-4.3/libs/default.nix
View File

@ -1,6 +1,6 @@
{ 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 , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr
, automoc4, phonon, strigi, soprano , automoc4, phonon, strigi, soprano
}: }:
@ -16,9 +16,12 @@ 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 shared_mime_info giflib jasper /* openexr */ aspell avahi kerberos acl attr
automoc4 phonon strigi soprano 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 = { meta = {
description = "KDE libraries"; description = "KDE libraries";