From 7eb92a7821c17bd3c3dbfc338b6252d0d1beda3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 28 Sep 2010 22:37:44 +0000 Subject: [PATCH] Adding kadu (patch by Piotr Pietraszkiewicz) svn path=/nixpkgs/trunk/; revision=23988 --- .../instant-messengers/kadu/default.nix | 34 +++++++++++++++++++ .../instant-messengers/kadu/more-icons.patch | 12 +++++++ .../development/libraries/libgadu/default.nix | 19 +++++++++++ pkgs/top-level/all-packages.nix | 10 ++++++ 4 files changed, 75 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/kadu/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/kadu/more-icons.patch create mode 100644 pkgs/development/libraries/libgadu/default.nix diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix new file mode 100644 index 000000000000..a9b5e0d7a864 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }: + +stdenv.mkDerivation { + + name = "kadu-0.6.5.4"; + + src = fetchurl { + url = http://www.kadu.net/download/stable/kadu-0.6.5.4.tar.bz2; + sha256 = "09bdcyx75lca1pl6x3vfpawmdjn5pfxvwivb9xdhk4bdvswxgv4x"; + }; + + buildInputs = [ + cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib + ]; + + cmakeFlags = "-Wno-dev"; + + NIX_LDFLAGS="-lX11"; + + patches = [ ./more-icons.patch ]; + + patchPhase = '' + unset patchPhase; patchPhase + sed 's=/bin/bash=/${stdenv.shell}=g' -i \ + `find -type f -name '*.sh' -or -name 'autodownload'` + ''; + + meta = { + description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)"; + homepage = http://www.kadu.net/w/English:Main_Page; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch b/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch new file mode 100644 index 000000000000..60234d361f7c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch @@ -0,0 +1,12 @@ +--- kadu/.config 2010-01-18 17:13:31.000000000 +0100 ++++ kadu/.config 2010-09-28 21:21:48.000000000 +0200 +@@ -559,10 +559,10 @@ icons_glass16=y + icons_glass22=y + + # Desctiption: Tango 16x16 icons made by BlotoPosniegowe +-icons_tango16=n ++icons_tango16=y + + # Description: Oxygen 16x16 icons maintained by Piotr Pelzowski +-icons_oxygen16=n ++icons_oxygen16=y diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix new file mode 100644 index 000000000000..455380f55894 --- /dev/null +++ b/pkgs/development/libraries/libgadu/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + + name = "libgadu-1.9.0"; + + src = fetchurl { + url = http://toxygen.net/libgadu/files/libgadu-1.9.0.tar.gz; + sha256 = "1ygmda23hf7cysns9kglsiljzb4x8339n878k70yacgzm07dryhj"; + }; + + meta = { + description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; + homepage = http://toxygen.net/libgadu/; + platforms = stdenv.lib.platforms.linux; + license = "LGPLv2.1"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95fc2ce8d586..4c2810c6d315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2853,6 +2853,8 @@ let libdwg = callPackage ../development/libraries/libdwg { }; + libgadu = callPackage ../development/libraries/libgadu { }; + eglibc = callPackage ../development/libraries/eglibc { kernelHeaders = linuxHeaders; installLocales = getPkgConfig "glibc" "locales" false; @@ -5772,6 +5774,14 @@ let jwm = callPackage ../applications/window-managers/jwm { }; + kadu = callPackage ../applications/networking/instant-messengers/kadu { + stdenv = stdenv2; + qt = qt4; + inherit fetchurl cmake libgadu bash libsndfile wget alsaLib; + inherit (xlibs) libXScrnSaver libX11; + inherit (kde45) qca2; + }; + kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; kermit = callPackage ../tools/misc/kermit { };