From db2d658c41ccc85104dbc0c86a7f91be0eacfddd Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 12 Apr 2009 16:54:10 +0000 Subject: [PATCH] Updated konversation to version 1.1 svn path=/nixpkgs/trunk/; revision=14999 --- .../networking/irc/konversation/default.nix | 16 +++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 0e200482834..3cce3f02cfe 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, libX11, libXt, libXext, arts, qt, kdelibs, zlib, libpng, libjpeg, perl, expat}: +{stdenv, fetchurl, libX11, libXt, libXext, libXrender, libXft, + arts, qt, kdelibs, zlib, libpng, libjpeg, perl, expat}: stdenv.mkDerivation { - name = "konversation-1.0.1"; + name = "konversation-1.1"; src = fetchurl { - url = http://download.berlios.de/konversation/konversation-1.0.1.tar.bz2; - sha256 = "8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd"; + url = http://download.berlios.de/konversation/konversation-1.1.tar.bz2; + sha256 = "3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33"; }; - buildInputs = [arts qt kdelibs libX11 libXt libXext zlib libpng libjpeg perl expat]; - postConfigure = '' for i in `find . -name Makefile`; do echo $i; sed -i -e "s|-L/usr/lib||g" -e "s|\-R \$(x_libraries)||g" $i; done ''; + buildInputs = [ arts qt kdelibs libX11 libXt libXext libXrender libXft + zlib libpng libjpeg perl expat ]; meta = { + description = "An IRC client for KDE"; homepage = http://www.konversation.org; - license = "GPL"; + license = "GPLv2"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11762b4113..d8877129096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8476,7 +8476,7 @@ let konversation = import ../applications/networking/irc/konversation { inherit fetchurl stdenv perl arts kdelibs zlib libpng libjpeg expat; - inherit (xlibs) libX11 libXt libXext; + inherit (xlibs) libX11 libXt libXext libXrender libXft; qt = qt3; };