svn path=/nixpkgs/trunk/; revision=17081

pkgs/desktops/kde/kdebase/default.nix

@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
-, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib
-}:
-
-# Note: the glib dependency is needed for nspluginviewer.
-
-let version = "3.5.10"; in
-
-stdenv.mkDerivation {
-  name = "kdebase-${version}";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
-    sha256 = "0qbbw78b725kf35p5jx11zq0246zm15pyyhmlpkz4cn5527rvakp";
-  };
-
-  buildInputs = [
-    pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2
-    fontconfig pam hal dbus glib
-    xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
-    xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
-    xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
-    xlibs.scrnsaverproto xlibs.libXScrnSaver
-    xlibs.libXcomposite xlibs.libXfixes
-  ];
-
-  configureFlags = ''
-    --without-arts 
-    --with-ssl-dir=${openssl}
-    --with-extra-includes=${libjpeg}/include
-  '';
-
-  # Prevent configure from looking for pkg-config and freetype-config
-  # in the wrong location (it looks in /usr/bin etc. *before* looking
-  # in $PATH).
-  preConfigure = ''
-    substituteInPlace configure \
-      --replace /usr/bin /no-such-path \
-      --replace /usr/local/bin /no-such-path \
-      --replace /opt/local/bin /no-such-path
-  '';
-
-  # 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";
-
-  # Work around some inexplicable build failure starting in kdebase 3.5.9.
-  LDFLAGS = "-L${kdelibs}/lib";
-}

pkgs/desktops/kde/kdelibs/default.nix

@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
-, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
-, freetype, bzip2, cups, attr, acl
-}:
-
-let version = "3.5.10"; in
-
-stdenv.mkDerivation {
-  name = "kdelibs-${version}";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
-    sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
-  };
-
-  passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
-  
-  buildInputs = [
-    zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
-    libxslt expat 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
-  # in the wrong location (it looks in /usr/bin etc. *before* looking
-  # in $PATH).
-  preConfigure = ''
-    substituteInPlace configure \
-      --replace /usr/bin /no-such-path \
-      --replace /usr/local/bin /no-such-path \
-      --replace /opt/local/bin /no-such-path
-  '';
-
-  configureFlags = ''
-    --without-arts 
-    --with-ssl-dir=${openssl}
-    --with-extra-includes=${libjpeg}/include
-    --x-includes=${xlibs.libX11}/include
-    --x-libraries=${xlibs.libX11}/lib
-  '';
-}