diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index d1af2ad70d19..b7566e0be4b0 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols -, openssl, protobuf, qmakeHook +, openssl, protobuf, qmake }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index a20119e0d731..c61c62dc8ba4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -3,7 +3,7 @@ , qtimageformats, qtgraphicaleffects, qtwebkit , telegram-qml, libqtelegram-aseman-edition , gst_all_1 -, makeQtWrapper, qmakeHook }: +, makeQtWrapper, qmake }: stdenv.mkDerivation rec { name = "cutegram-${meta.version}"; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { telegram-qml libqtelegram-aseman-edition ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; enableParallelBuilding = true; + nativeBuildInputs = [ makeQtWrapper qmake ]; fixupPhase = '' wrapQtProgram $out/bin/cutegram \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 322c40afc7dc..ec2e65dc4997 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmakeHook }: +, qtbase, qtmultimedia, qtquick1, qmake }: stdenv.mkDerivation rec { name = "libqtelegram-aseman-edition-${meta.version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qtmultimedia qtquick1 ]; - nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; patchPhase = '' substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" "" diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index 854648d97862..c8d24c9b28c1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmakeHook +, qtbase, qtmultimedia, qtquick1, qmake , libqtelegram-aseman-edition }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; - nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; patchPhase = '' substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" "" diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 0dfda79e767c..d602e887f264 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }: +{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "tensor-git-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ qtbase qtquickcontrols ]; - nativeBuildInputs = [ qmakeHook makeQtWrapper ]; + nativeBuildInputs = [ qmake makeQtWrapper ]; desktopItem = makeDesktopItem { name = "tensor"; |