From 93393a6748da9551e3cefb4bad60d3df3e1e9b65 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sun, 13 May 2007 14:22:24 +0000 Subject: [PATCH] Added aspell Added gtkspell Added pidgin, builds but does not run yet: running pidgin fails to find libX11.so.6. ldd on pidgin reports: libX11.so.6 => not found .... libX11.so.6 => /nix/store/brsva6rh1p2ymjvk7054a90is5panrhf-libX11-1.1.1/lib/libX11.so.6 (0xb7358000) which looks a bit weird ... Maybe some problem with patchelf? Or just a build problem and should the library path be set using an environment variable? svn path=/nixpkgs/trunk/; revision=8660 --- .../instant-messengers/pidgin/builder.sh | 9 ++++++ .../instant-messengers/pidgin/default.nix | 32 +++++++++++++++++++ pkgs/development/libraries/aspell/default.nix | 11 +++++++ .../libraries/gtkspell/default.nix | 12 +++++++ pkgs/top-level/all-packages.nix | 16 ++++++++++ 5 files changed, 80 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin/builder.sh create mode 100644 pkgs/applications/networking/instant-messengers/pidgin/default.nix create mode 100644 pkgs/development/libraries/aspell/default.nix create mode 100644 pkgs/development/libraries/gtkspell/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/builder.sh b/pkgs/applications/networking/instant-messengers/pidgin/builder.sh new file mode 100644 index 000000000000..11c9cd964e1c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +configureFlags="\ + --with-nspr-includes=$nss/include/nspr \ + --with-nspr-libs=$nss/lib \ + --with-nss-includes=$nss/include/nss \ + --with-nss-libs=$nss/lib" + +genericBuild diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix new file mode 100644 index 000000000000..77ecbb39e525 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -0,0 +1,32 @@ +/** + * Possible missing configuration: + * + * - silcclient + * - libebook-1.2 + * - libedata-book-1.2 + * - checking for XScreenSaverRegister in -lXext... no + * - checking for XScreenSaverRegister in -lXss... no + * - ao + * - audiofile-config + * - doxygen + */ +{ stdenv, fetchurl, pkgconfig, glib, gtk, gtkspell, aspell, + GStreamer, startupnotification, gettext, + perl, perlXMLParser, libxml2, openssl, nss +} : + +stdenv.mkDerivation { + name = "pidgin-2.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = http://kent.dl.sourceforge.net/sourceforge/pidgin/pidgin-2.0.0.tar.bz2; + md5 = "132355d7e236d9c2820a2668621eef43"; + }; + + inherit nss; + buildInputs = [ + pkgconfig glib gtk gtkspell aspell + GStreamer startupnotification gettext + perl perlXMLParser libxml2 openssl nss + ]; +} diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix new file mode 100644 index 000000000000..52f7818428fd --- /dev/null +++ b/pkgs/development/libraries/aspell/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation { + name = "aspell-0.60.5"; + src = fetchurl { + url = ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.5.tar.gz; + md5 = "17fd8acac6293336bcef44391b71e337"; + }; + + buildInputs = [perl]; +} diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix new file mode 100644 index 000000000000..46e1bba488a5 --- /dev/null +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, gtk, aspell, pkgconfig}: + +stdenv.mkDerivation { + name = "gtkspell-2.0.11"; + + src = fetchurl { + url = http://gtkspell.sourceforge.net/download/gtkspell-2.0.11.tar.gz; + md5 = "494869f67146a12a3f17a958f51aeb05"; + }; + + buildInputs = [aspell pkgconfig gtk]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a26dcd6f43f..0547bf5a8410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1200,6 +1200,10 @@ rec { inherit fetchurl stdenv; }; + aspell = import ../development/libraries/aspell { + inherit fetchurl stdenv perl; + }; + audiofile = import ../development/libraries/audiofile { inherit fetchurl stdenv; }; @@ -1396,6 +1400,12 @@ rec { gtksharp = gtksharp2; }; + gtkspell = import ../development/libraries/gtkspell { + inherit fetchurl stdenv pkgconfig; + inherit (gtkLibs) gtk; + inherit aspell; + }; + id3lib = import ../development/libraries/id3lib { inherit fetchurl stdenv; }; @@ -2667,6 +2677,12 @@ rec { inherit (gtkLibs) glib gtk; }; + pidgin = import ../applications/networking/instant-messengers/pidgin { + inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext; + inherit (gtkLibs) glib gtk; + inherit (gnome) startupnotification; + }; + gimp = import ../applications/graphics/gimp { inherit fetchurl stdenv pkgconfig freetype fontconfig libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext;