BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tdesktop: move to qmakeHook

Browse source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:36:28 +03:00
parent 56b63b91b4
commit 82bf15393d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats { stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats
, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 , 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 , pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms
, libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16 , libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus
gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk
dee libdbusmenu-glib libva dee libdbusmenu-glib libva qmakeHook
# Qt dependencies # Qt dependencies
libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
libpng libjpeg freetype harfbuzz pcre16 xproto libX11 libpng libjpeg freetype harfbuzz pcre16 xproto libX11
@ -73,10 +73,9 @@ in stdenv.mkDerivation rec {
qtSrcs = qtbase.srcs ++ [ qtimageformats.src ]; qtSrcs = qtbase.srcs ++ [ qtimageformats.src ];
qtPatches = qtbase.patches; qtPatches = qtbase.patches;
buildCommand = '' dontUseQmakeConfigure = true;
# We don't use nativeBuildInputs to avoid adding system Qt 5 libraries to various paths.
export PATH="${qtbase}/bin:$PATH"
buildCommand = ''
unpackPhase unpackPhase
cd "$sourceRoot" cd "$sourceRoot"
patchPhase patchPhase