From bd6a683c4c19c38d5fa865a0d24455d7b8577eae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Mar 2007 15:49:38 +0000 Subject: [PATCH] * Added kdebase. svn path=/nixpkgs/trunk/; revision=8418 --- pkgs/desktops/kde/kdebase/default.nix | 33 +++++++++++++++++++++++++++ pkgs/desktops/kde/kdelibs/default.nix | 2 +- pkgs/top-level/all-packages.nix | 9 ++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/kde/kdebase/default.nix diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde/kdebase/default.nix new file mode 100644 index 000000000000..7f76cc432076 --- /dev/null +++ b/pkgs/desktops/kde/kdebase/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, x11, zlib, libpng, libjpeg, perl, qt +, kdelibs, openssl, bzip2, fontconfig +, libXrandr, libXinerama, libXau, libXdmcp, libXcursor, libfontenc +, imake, bdftopcf +}: + +stdenv.mkDerivation { + name = "kdebase-3.5.6"; + + src = fetchurl { + url = http://ftp.scarlet.be/pub/kde/stable/3.5.6/src/kdebase-3.5.6.tar.bz2; + sha256 = "0zmxnw4p8bkd2b867cwdzdnp36ikwnz0ffrbx6d3ylz1nbw3anr4"; + }; + + buildInputs = [ + pkgconfig x11 zlib libpng libjpeg perl qt + kdelibs openssl bzip2 fontconfig + libXrandr libXinerama libXau libXdmcp libXcursor libfontenc + imake bdftopcf + ]; + + configureFlags = " + --without-arts + --with-ssl-dir=${openssl} + --with-extra-includes=${libjpeg}/include + "; + + # Quick hack to work around a faulty dependency in + # konqueror/keditbookmarks/Makefile.am (${includedir} should be + # ${kdelibs} or so). + preBuild = "ensureDir $out/include; ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/"; + postInstall = "rm $out/include/kbookmarknotifier.h"; +} diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix index fb2a6e6f86f6..3c4733664762 100644 --- a/pkgs/desktops/kde/kdelibs/default.nix +++ b/pkgs/desktops/kde/kdelibs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { libtool freetype bzip2 ]; - configureFlags=" + configureFlags = " --without-arts --with-ssl-dir=${openssl} --with-extra-includes=${libjpeg}/include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bffc47bb139..cfe2686cc724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3097,6 +3097,15 @@ rec { qt = qt3; }; + kdebase = import ../desktops/kde/kdebase { + inherit + fetchurl stdenv pkgconfig x11 zlib libpng libjpeg perl + kdelibs openssl bzip2 fontconfig; + inherit (xlibs) libXrandr libXinerama libXau libXdmcp libXcursor + libfontenc imake bdftopcf; + qt = qt3; + }; + ### MISC