From 7e3c1b357bbfe6293c2577db341db2d22d185882 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 7 Oct 2011 20:46:21 +0000 Subject: [PATCH] Drop kde3.kdebase Hydra fails to build it for a while, and nobody noticed. svn path=/nixpkgs/trunk/; revision=29714 --- pkgs/desktops/kde-3/kdebase/default.nix | 57 ------------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 63 deletions(-) delete mode 100644 pkgs/desktops/kde-3/kdebase/default.nix diff --git a/pkgs/desktops/kde-3/kdebase/default.nix b/pkgs/desktops/kde-3/kdebase/default.nix deleted file mode 100644 index 6a6a1ea4a1e4..000000000000 --- a/pkgs/desktops/kde-3/kdebase/default.nix +++ /dev/null @@ -1,57 +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"; - - meta.platforms = stdenv.lib.platforms.linux; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f927dec6d983..efe6f70887b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7867,12 +7867,6 @@ let qt = qt3; }; - kdebase = callPackage ../desktops/kde-3/kdebase { - stdenv = overrideGCC stdenv gcc43; - inherit (kde3) kdelibs; - qt = qt3; - }; - arts = callPackage ../development/libraries/arts { qt = qt3; inherit (gnome) glib;