gnokii-0.6.30, add ical and gtk support

svn path=/nixpkgs/trunk/; revision=26334
This commit is contained in:
Yury G. Kudryashov 2011-03-15 23:09:14 +00:00
parent a9eb45ae18
commit db3b157ff6
3 changed files with 10 additions and 18 deletions

View File

@ -5,7 +5,8 @@ let
s = import ./src-for-default.nix; s = import ./src-for-default.nix;
buildInputs = with a; [ buildInputs = with a; [
perl intltool gettext libusb perl intltool gettext libusb
glib pkgconfig glib gtk pkgconfig bluez readline
libXpm pcsclite libical
]; ];
in in
@ -18,18 +19,7 @@ rec {
configureFlags = []; configureFlags = [];
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = [ "setDebug" "doConfigure" "doMakeInstall"]; phaseNames = [ "doConfigure" "doMakeInstall"];
setDebug = a.fullDepEntry ''
mkdir -p $out/src
cp -R * $out/src
cd $out/src
export NIX_STRIP_DEBUG=0
export CFLAGS="-ggdb -O0 -include ${a.stdenv.glibc}/include/locale.h"
export CXXFLAGS="-ggdb -O0"
'' [ "minInit" "doUnpack" ];
inherit(s) name; inherit(s) name;
meta = { meta = {

View File

@ -1,9 +1,9 @@
rec { rec {
version="0.6.29"; version="0.6.30";
name="gnokii-0.6.29"; name="gnokii-0.6.30";
hash="0w94balyy9l0xy8x3z20f127b5ijpm9a9fbbskz147jyzhprgw0l"; hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p";
url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz"; url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.29.tar.gz"; advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.30.tar.gz";
} }

View File

@ -680,8 +680,10 @@ let
glxinfo = callPackage ../tools/graphics/glxinfo { }; glxinfo = callPackage ../tools/graphics/glxinfo { };
gnokii = builderDefsPackage (import ../tools/misc/gnokii) { gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
inherit intltool perl gettext libusb pkgconfig; inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite
libical;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (xorg) libXpm;
}; };
gnugrep = gnugrep =