diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-08 18:17:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-08 18:17:52 +0200 |
commit | 6f292e925042b71198fb8813d34319eb8877da6e (patch) | |
tree | 61be9e3eab7f19faa963099917ef544e26fc29bf /pkgs/applications/networking | |
parent | 5d1a8ecd916893ac377311de4abd5d7043646280 (diff) | |
parent | 72699348c8739ae47dc773243712143e006cebc5 (diff) | |
download | nixlib-6f292e925042b71198fb8813d34319eb8877da6e.tar nixlib-6f292e925042b71198fb8813d34319eb8877da6e.tar.gz nixlib-6f292e925042b71198fb8813d34319eb8877da6e.tar.bz2 nixlib-6f292e925042b71198fb8813d34319eb8877da6e.tar.lz nixlib-6f292e925042b71198fb8813d34319eb8877da6e.tar.xz nixlib-6f292e925042b71198fb8813d34319eb8877da6e.tar.zst nixlib-6f292e925042b71198fb8813d34319eb8877da6e.zip |
Merge pull request #29120 from Lassulus/ceneterim-update
centerim: 4.22.10 -> 5.0.1
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/centerim/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index d6921e1082be..350d09078c41 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -1,24 +1,27 @@ -{stdenv, fetchurl, openssl, curl, ncurses, libjpeg +{stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg , withGpg ? true, gpgme ? null}: stdenv.mkDerivation rec { - version = "4.22.10"; - debPatch = "2"; - name = "centerim-${version}"; + version = "5.0.1"; + name = "centerim5-${version}"; src = fetchurl { - url = "http://centerim.org/download/releases/${name}.tar.gz"; + url = "http://centerim.org/download/cim5/${name}.tar.gz"; sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; }; - patches = fetchurl { - url = "mirror://debian/pool/main/c/centerim/centerim_${version}-${debPatch}.diff.gz"; - sha256 = "18iz3hkvr31jsyznryvyldxm9ckyrpy9sczxikrnw2i2r1xyfj8m"; - }; + + CXXFLAGS = "-std=gnu++98"; buildInputs = [ openssl curl ncurses libjpeg ] ++ stdenv.lib.optional withGpg gpgme; - configureFlags = [ "--with-openssl=${openssl.dev}" ]; + preConfigure = '' + ${gnused}/bin/sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h + ''; + + configureFlags = [ + "--with-openssl=${openssl.dev}" + ]; meta = { homepage = http://www.centerim.org/; |