Merge pull request #26700 from gleber/fix-qmakeHook

qt: fix qmakeHook -> qmake in few packages.

Changed files
+6 -6
pkgs
applications
networking
feedreaders
rssguard
tools
misc
ultrastar-creator
ultrastar-manager
+2 -2
pkgs/applications/networking/feedreaders/rssguard/default.nix
···
-
{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rssguard-${version}";
···
};
buildInputs = [ qtwebengine qttools ];
-
nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
qmakeFlags = [ "CONFIG+=release" ];
meta = with stdenv.lib; {
···
+
{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rssguard-${version}";
···
};
buildInputs = [ qtwebengine qttools ];
+
nativeBuildInputs = [ qmake wrapGAppsHook ];
qmakeFlags = [ "CONFIG+=release" ];
meta = with stdenv.lib; {
+2 -2
pkgs/tools/misc/ultrastar-creator/default.nix
···
{ stdenv, fetchFromGitHub
-
, qmakeHook, qtbase, makeQtWrapper
, pkgconfig, taglib, libbass, libbass_fx }:
stdenv.mkDerivation rec {
···
cd src
'';
-
nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
buildInputs = [ qtbase taglib libbass libbass_fx ];
meta = with stdenv.lib; {
···
{ stdenv, fetchFromGitHub
+
, qmake, qtbase, makeQtWrapper
, pkgconfig, taglib, libbass, libbass_fx }:
stdenv.mkDerivation rec {
···
cd src
'';
+
nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
buildInputs = [ qtbase taglib libbass libbass_fx ];
meta = with stdenv.lib; {
+2 -2
pkgs/tools/misc/ultrastar-manager/default.nix
···
-
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
, qtbase, qtmultimedia, makeQtWrapper
, taglib, libmediainfo, libzen, libbass }:
···
name = "ultrastar-manager-${name}-plugin-${version}";
src = patchedSrc;
-
buildInputs = [ qmakeHook ] ++ buildInputs;
postPatch = ''
sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \
···
+
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
, qtbase, qtmultimedia, makeQtWrapper
, taglib, libmediainfo, libzen, libbass }:
···
name = "ultrastar-manager-${name}-plugin-${version}";
src = patchedSrc;
+
buildInputs = [ qmake ] ++ buildInputs;
postPatch = ''
sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \