Adding kerberos into kdelibs (I think this may enable konqueror browse https)
svn path=/nixpkgs/trunk/; revision=19495
This commit is contained in:
parent
1743ba3ba8
commit
9b5743ceac
@ -56,7 +56,8 @@ pkgs.recurseIntoAttrs (rec {
|
|||||||
### LIBS
|
### LIBS
|
||||||
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;
|
||||||
inherit automoc4 phonon strigi soprano;
|
inherit automoc4 phonon strigi soprano;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -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
|
, xz, flex, bison, openexr, aspell, avahi, kerberos
|
||||||
, automoc4, phonon, strigi, soprano
|
, automoc4, phonon, strigi, soprano
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ 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
|
shared_mime_info giflib jasper /* openexr */ aspell avahi kerberos
|
||||||
automoc4 phonon strigi soprano
|
automoc4 phonon strigi soprano
|
||||||
];
|
];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user