diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-06-09 21:37:24 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-06-09 21:37:24 +0300 |
commit | 7b84294bd94b66111c4360fa9036d6bf410a1207 (patch) | |
tree | 7739ebb8c6afbd19f6a48bc47de7359addad7ef2 /pkgs/applications/networking/instant-messengers/telegram | |
parent | 97d791978cca24515409b53c9cc0cef28f972ea8 (diff) | |
download | nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.tar nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.tar.gz nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.tar.bz2 nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.tar.lz nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.tar.xz nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.tar.zst nixlib-7b84294bd94b66111c4360fa9036d6bf410a1207.zip |
tdesktop: fix with new Qt
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5d2cc9fa155b..9f398fbf9549 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -10,10 +10,11 @@ let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; + packagedQt = "5.6.0"; in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; version = "0.9.49"; - qtVersion = lib.replaceStrings ["."] ["_"] qtbase.version; + qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; @@ -63,7 +64,7 @@ in stdenv.mkDerivation rec { "LIBS+=-lssl" ]; - qtSrcs = qtbase.srcs ++ [ qtimageformats.src ]; + qtSrcs = [ qtbase.src qtimageformats.src ]; qtPatches = qtbase.patches; buildCommand = '' @@ -79,7 +80,8 @@ in stdenv.mkDerivation rec { -e 's,LIBS += .*libz.a,LIBS += -lz,' \ -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \ -e 's, -flto,,g' \ - -e 's, -static-libstdc++,,g' + -e 's, -static-libstdc++,,g' \ + -e 's,${packagedQt},${qtbase.version},g' export QMAKE=$PWD/../qt/bin/qmake ( mkdir -p ../Libraries @@ -87,18 +89,15 @@ in stdenv.mkDerivation rec { for i in $qtSrcs; do tar -xaf $i done - mv qt-everywhere-opensource-src-* QtStatic - mv qtbase-opensource-src-* ./QtStatic/qtbase - mv qtimageformats-opensource-src-* ./QtStatic/qtimageformats - cd QtStatic/qtbase - patch -p1 < ../../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff - cd .. + cd qtbase-* + patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff for i in $qtPatches; do patch -p1 < $i done ${qtbase.postPatch} + cd .. - export configureFlags="-prefix "$PWD/../../qt" -release -opensource -confirm-license -system-zlib \ + export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \ -openssl-linked -dbus-linked -system-sqlite -verbose \ @@ -107,13 +106,13 @@ in stdenv.mkDerivation rec { export dontAddPrefix=1 export MAKEFLAGS=-j$NIX_BUILD_CORES - ( cd qtbase + ( cd qtbase-* configurePhase buildPhase make install ) - ( cd qtimageformats + ( cd qtimageformats-* $QMAKE buildPhase make install |