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/boost_regex.patch | |
| 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/boost_regex.patch')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch b/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch new file mode 100644 index 000000000000..3d4c46b2431d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch @@ -0,0 +1,17 @@ +Index: twinkle-1.4.2/configure.in +=================================================================== +--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.160534950 -0400 ++++ twinkle-1.4.2/configure.in 2013-07-25 11:07:59.000000000 -0400 +@@ -294,7 +294,11 @@ + AC_CHECK_LIB(boost_regex-gcc, main, [ + LIBS="-lboost_regex-gcc $LIBS" + echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO], +- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])]) ++ [ ++ AC_CHECK_LIB(boost_regex, main, [ ++ LIBS="-lboost_regex $LIBS" ++ echo "LIBS += -lboost_regex" >> $QT_INCL_PRO], ++ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])]) + + ms_CHECK_LRELEASE() + |