diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /pkgs/applications/networking/instant-messengers/twinkle/default.nix | |
parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
download | nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2 nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip |
Merge recent master into staging
Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/twinkle/default.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/twinkle/default.nix | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 060c844980bb..2e6b904c134e 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,29 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost +{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost , libsndfile, libxml2, libjpeg, readline, qt3, perl, file , alsaLib, speex, libzrtpcpp, xorg }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "twinkle-1.4.2"; src = fetchurl { - url = http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-1.4.2.tar.gz; + url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz"; sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0"; }; + patches = [ # all from Debian + ./newer-libccrtp.diff + ./libgsm.patch + ./localetime_r_conflict.diff + ./boost_regex.patch # modified not to use "-mt" suffix + ]; + configureFlags = "--with-extra-includes=${libjpeg}/include"; buildInputs = - [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile + [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile libxml2 libjpeg readline qt3 perl file # optional ? : - alsaLib - speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext + alsaLib speex + libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext ]; - meta = { - homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.twinklephone.com/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } |