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/newer-libccrtp.diff | |
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/newer-libccrtp.diff')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff b/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff new file mode 100644 index 000000000000..9d07b3dbd6ae --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff @@ -0,0 +1,22 @@ +Index: twinkle-1.4.2/configure.in +=================================================================== +--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:09:16.000000000 -0400 ++++ twinkle-1.4.2/configure.in 2013-07-25 11:11:59.512418187 -0400 +@@ -66,7 +66,7 @@ + + export PKG_CONFIG_PATH + +-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0) ++PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0) + + PKG_CHECK_MODULES(XML2, libxml-2.0) + # AC_CHECK_HEADER(libxml/tree.h, [], +@@ -136,7 +136,7 @@ + #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO + # libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and + # should include above flags ! +-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO ++echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO + echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO + + # get libraries specified on command line |