[Nix-dev] [PATCH] Add Nix expressions for kadu

[Lluís Batlle i Rossell]

This and crack-attack look fine for me. I commited them.

In the kadu, maybe you could have avoided the line about fetchurl, cmake, ...
and x11libs. The callPackage function will take care of those. You may write
only the attributes with different names and those of kde.

On Wed, Sep 29, 2010 at 12:29:21AM +0200, Piotr Pietraszkiewicz wrote:
>  Kadu is an instant-messenger client for the, very popular in
> Poland, gadu-gadu IM network.
> 
> This is my first post regarding kadu so please take a peek inside
> the patch. Perhaps you come up with some improvement suggestions.
> 
> Piotr

> Index: pkgs/development/libraries/libgadu/default.nix
> ===================================================================
> --- pkgs/development/libraries/libgadu/default.nix	(revision 0)
> +++ pkgs/development/libraries/libgadu/default.nix	(revision 0)
> @@ -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";
> +  };
> +
> +}
> Index: pkgs/applications/networking/instant-messengers/kadu/default.nix
> ===================================================================
> --- pkgs/applications/networking/instant-messengers/kadu/default.nix	(revision 0)
> +++ pkgs/applications/networking/instant-messengers/kadu/default.nix	(revision 0)
> @@ -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;
> +  };
> +}
> Index: pkgs/applications/networking/instant-messengers/kadu/more-icons.patch
> ===================================================================
> --- pkgs/applications/networking/instant-messengers/kadu/more-icons.patch	(revision 0)
> +++ pkgs/applications/networking/instant-messengers/kadu/more-icons.patch	(revision 0)
> @@ -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
> Index: pkgs/top-level/all-packages.nix
> ===================================================================
> --- pkgs/top-level/all-packages.nix	(revision 23986)
> +++ pkgs/top-level/all-packages.nix	(working copy)
> @@ -2853,6 +2853,8 @@
>  
>    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 @@
>  
>    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 { };

> _______________________________________________
> nix-dev mailing list
> nix-dev at cs.uu.nl
> https://mail.cs.uu.nl/mailman/listinfo/nix-dev