diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:36:28 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:45 +0300 |
| commit | 82bf15393d1af2cc2ce0309a4774a9f26d1d2571 (patch) | |
| tree | 5890727de43f74abd56980e1f7ca4092377111fb /pkgs/applications/networking/instant-messengers/telegram | |
| parent | 56b63b91b425ed846867959441b07618a0a50406 (diff) | |
| download | nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.tar nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.tar.gz nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.tar.bz2 nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.tar.lz nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.tar.xz nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.tar.zst nixlib-82bf15393d1af2cc2ce0309a4774a9f26d1d2571.zip | |
tdesktop: move to qmakeHook
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 77a0d9ee0aac..e734ddc57009 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libunity, dee, libdbusmenu-glib, libva +, libunity, dee, libdbusmenu-glib, libva, qmakeHook , pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms , libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16 @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { buildInputs = [ breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva + dee libdbusmenu-glib libva qmakeHook # Qt dependencies libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libpng libjpeg freetype harfbuzz pcre16 xproto libX11 @@ -73,10 +73,9 @@ in stdenv.mkDerivation rec { qtSrcs = qtbase.srcs ++ [ qtimageformats.src ]; qtPatches = qtbase.patches; - buildCommand = '' - # We don't use nativeBuildInputs to avoid adding system Qt 5 libraries to various paths. - export PATH="${qtbase}/bin:$PATH" + dontUseQmakeConfigure = true; + buildCommand = '' unpackPhase cd "$sourceRoot" patchPhase |