From 7a3f60258029dd36d44ccd243d7f15a6aa7ef6d9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Apr 2010 17:06:19 +0000 Subject: [PATCH] Get rid of decibel and tapioca-qt It never worked, and nothing use it. svn path=/nixpkgs/trunk/; revision=21185 --- pkgs/desktops/kde-4.4/default.nix | 6 +----- pkgs/desktops/kde-4.4/network/default.nix | 4 ++-- .../desktops/kde-4.4/support/decibel/default.nix | 16 ---------------- .../development/libraries/tapioca-qt/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/support/decibel/default.nix delete mode 100644 pkgs/development/libraries/tapioca-qt/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 213d0958aed..3e71c3aad5e 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -44,10 +44,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 soprano; }; - decibel = import ./support/decibel { - inherit (pkgs) stdenv fetchurl lib cmake qt4 tapioca_qt telepathy_qt; - }; - eigen = import ./support/eigen { inherit (pkgs) stdenv fetchurl lib cmake; }; @@ -150,7 +146,7 @@ pkgs.recurseIntoAttrs (rec { kdenetwork = import ./network { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; - inherit (pkgs) libidn libvncserver tapioca_qt libmsn giflib gpgme boost libv4l; + inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l; inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm; inherit kdelibs kdepimlibs; inherit automoc4 phonon qca2 soprano qimageblitz strigi; diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix index 63c6fb733d3..8192b06da94 100644 --- a/pkgs/desktops/kde-4.4/network/default.nix +++ b/pkgs/desktops/kde-4.4/network/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn -, libvncserver, tapioca_qt, libmsn, giflib, gpgme, boost, libv4l +, libvncserver, libmsn, giflib, gpgme, boost, libv4l , libXi, libXtst, libXdamage, libXxf86vm , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "08rlbixv1q3x3zscyfr2jpdr33rgaw54hyszyd92ny6l13g2hf56"; }; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn - libvncserver tapioca_qt libmsn giflib gpgme boost stdenv.gcc.libc libv4l + libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l libXi libXtst libXdamage libXxf86vm kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ]; meta = { diff --git a/pkgs/desktops/kde-4.4/support/decibel/default.nix b/pkgs/desktops/kde-4.4/support/decibel/default.nix deleted file mode 100644 index ad6eaa98fe9..00000000000 --- a/pkgs/desktops/kde-4.4/support/decibel/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, tapioca_qt, telepathy_qt}: - -stdenv.mkDerivation { - name = "decibel-0.5.0"; - src = fetchurl { - url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz; - md5 = "7de299ace568c87a746388ad765228e5"; - }; - buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ]; - meta = { - description = "Realtime communications framework for KDE"; - license = "LGPL"; - homepage = http://decibel.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/development/libraries/tapioca-qt/default.nix b/pkgs/development/libraries/tapioca-qt/default.nix deleted file mode 100644 index 5d5fad9d928..00000000000 --- a/pkgs/development/libraries/tapioca-qt/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, telepathy_qt}: - -stdenv.mkDerivation { - name = "tapioca-qt-0.14.1"; - src = fetchurl { - url = mirror://sourceforge/tapioca-voip/tapioca-qt-0.14.1.tar.gz; - md5 = "169318705af6386057b537c5317d520d"; - }; - buildInputs = [ cmake qt4 telepathy_qt ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 216716bb7e1..80423a146fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5003,10 +5003,6 @@ let inherit stdenv fetchurl cmake taglib; }; - tapioca_qt = import ../development/libraries/tapioca-qt { - inherit stdenv fetchurl cmake qt4 telepathy_qt; - }; - tdb = import ../development/libraries/tdb { inherit fetchurl stdenv libxslt libxml2 docbook_xsl; };