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

* kdelibs: build with ACL support. 

* kdebase updated to 3.5.9.  Some hackery to make it compile.  Now
  built with PAM support.

svn path=/nixpkgs/trunk/; revision=12165
This commit is contained in:
Eelco Dolstra 2008-06-19 22:20:49 +00:00
parent 418d5e3081
commit dca0666111
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/kde/kdebase/default.nix
View File

@ -1,24 +1,27 @@
{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl { stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
, qt, kdelibs, openssl, bzip2, fontconfig , qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib
}: }:
let version = "3.5.7"; in # Note: the glib dependency is needed for nspluginviewer.
let version = "3.5.9"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdebase-${version}"; name = "kdebase-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2"; url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
md5 = "b421e01b3ee712549ee967f58ed24de0"; md5 = "c8c35389a238aa1b73e68ef5298eadf8";
}; };
buildInputs = [ buildInputs = [
pkgconfig x11 zlib libpng libjpeg perl pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2
qt kdelibs openssl bzip2 fontconfig fontconfig pam hal dbus glib
xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
xlibs.scrnsaverproto xlibs.libXScrnSaver xlibs.scrnsaverproto xlibs.libXScrnSaver
xlibs.libXcomposite xlibs.libXfixes
]; ];
configureFlags = '' configureFlags = ''
@ -46,4 +49,7 @@ stdenv.mkDerivation {
''; '';
postInstall = "rm $out/include/kbookmarknotifier.h"; postInstall = "rm $out/include/kbookmarknotifier.h";
# Work around some inexplicable build failure starting in kdebase 3.5.9.
LDFLAGS = "-L${kdelibs}/lib";
} }

18
pkgs/desktops/kde/kdelibs/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre { stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups , freetype, bzip2, cups, attr, acl
}: }:
let version = "3.5.9"; in let version = "3.5.9"; in
@ -13,14 +13,16 @@ stdenv.mkDerivation {
md5 = "55e5f00874933d1a7ba7c95e369a205e"; md5 = "55e5f00874933d1a7ba7c95e369a205e";
}; };
passthru = {inherit openssl libX11 libjpeg qt;}; passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
buildInputs = [ buildInputs = [
libX11 libXt libXext zlib perl qt openssl pcre zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
pkgconfig libjpeg libpng libtiff libxml2 libxslt expat libxslt expat libtool freetype bzip2 cups
libtool freetype bzip2 cups xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
]; ];
propagatedBuildInputs = [attr acl];
# Prevent configure from looking for pkg-config and freetype-config # Prevent configure from looking for pkg-config and freetype-config
# in the wrong location (it looks in /usr/bin etc. *before* looking # in the wrong location (it looks in /usr/bin etc. *before* looking
# in $PATH). # in $PATH).
@ -35,7 +37,7 @@ stdenv.mkDerivation {
--without-arts --without-arts
--with-ssl-dir=${openssl} --with-ssl-dir=${openssl}
--with-extra-includes=${libjpeg}/include --with-extra-includes=${libjpeg}/include
--x-includes=${libX11}/include --x-includes=${xlibs.libX11}/include
--x-libraries=${libX11}/lib --x-libraries=${xlibs.libX11}/lib
''; '';
} }

8
pkgs/top-level/all-packages.nix
View File

@ -6784,10 +6784,9 @@ let pkgs = rec {
kdelibs = import ../desktops/kde/kdelibs { kdelibs = import ../desktops/kde/kdelibs {
inherit inherit
fetchurl stdenv zlib perl openssl pcre pkgconfig fetchurl stdenv xlibs zlib perl openssl pcre pkgconfig
libjpeg libpng libtiff libxml2 libxslt libtool libjpeg libpng libtiff libxml2 libxslt libtool
expat freetype bzip2 cups; expat freetype bzip2 cups attr acl;
inherit (xlibs) libX11 libXt libXext;
qt = qt3; qt = qt3;
}; };
@ -6818,7 +6817,8 @@ let pkgs = rec {
kdebase = import ../desktops/kde/kdebase { kdebase = import ../desktops/kde/kdebase {
inherit inherit
fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
kdelibs openssl bzip2 fontconfig; kdelibs openssl bzip2 fontconfig pam hal dbus;
inherit (gtkLibs) glib;
qt = qt3; qt = qt3;
}; };