diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-03-15 23:09:14 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-03-15 23:09:14 +0000 |
| commit | db3b157ff6a71424991d32bda1b99146a6d3c3e5 (patch) | |
| tree | 54f4725cb73a3fbdda58683cc7de513d7e3c4e8b /pkgs | |
| parent | a9eb45ae180950976222c794cfc535d97f26aa47 (diff) | |
| download | nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.tar nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.tar.gz nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.tar.bz2 nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.tar.lz nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.tar.xz nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.tar.zst nixlib-db3b157ff6a71424991d32bda1b99146a6d3c3e5.zip | |
gnokii-0.6.30, add ical and gtk support
svn path=/nixpkgs/trunk/; revision=26334
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/gnokii/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/misc/gnokii/src-for-default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 10 insertions, 18 deletions
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 7ce810a7b56f..d0354a7bb6ed 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -5,7 +5,8 @@ let s = import ./src-for-default.nix; buildInputs = with a; [ perl intltool gettext libusb - glib pkgconfig + glib gtk pkgconfig bluez readline + libXpm pcsclite libical ]; in @@ -18,19 +19,8 @@ rec { configureFlags = []; /* 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; meta = { description = "Cellphone tool"; diff --git a/pkgs/tools/misc/gnokii/src-for-default.nix b/pkgs/tools/misc/gnokii/src-for-default.nix index c428690cae73..360f98de7584 100644 --- a/pkgs/tools/misc/gnokii/src-for-default.nix +++ b/pkgs/tools/misc/gnokii/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.6.29"; - name="gnokii-0.6.29"; - hash="0w94balyy9l0xy8x3z20f127b5ijpm9a9fbbskz147jyzhprgw0l"; + version="0.6.30"; + name="gnokii-0.6.30"; + hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p"; 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"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dfa4b5817d7..44fa9d6bce07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -680,8 +680,10 @@ let glxinfo = callPackage ../tools/graphics/glxinfo { }; 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 (xorg) libXpm; }; gnugrep = |