qt: fix qmakeHook -> qmake in few packages.
This seem to have been broken in #26336.
This commit is contained in:
parent
96eaad8fd4
commit
2fb67d9b83
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
|
||||
{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rssguard-${version}";
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
|
||||
nativeBuildInputs = [ qmake wrapGAppsHook ];
|
||||
qmakeFlags = [ "CONFIG+=release" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub
|
||||
, qmakeHook, qtbase, makeQtWrapper
|
||||
, qmake, qtbase, makeQtWrapper
|
||||
, pkgconfig, taglib, libbass, libbass_fx }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
cd src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
|
||||
nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
|
||||
buildInputs = [ qtbase taglib libbass libbass_fx ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
|
||||
, qtbase, qtmultimedia, makeQtWrapper
|
||||
, taglib, libmediainfo, libzen, libbass }:
|
||||
|
||||
|
@ -60,7 +60,7 @@ let
|
|||
name = "ultrastar-manager-${name}-plugin-${version}";
|
||||
src = patchedSrc;
|
||||
|
||||
buildInputs = [ qmakeHook ] ++ buildInputs;
|
||||
buildInputs = [ qmake ] ++ buildInputs;
|
||||
|
||||
postPatch = ''
|
||||
sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \
|
||||
|
|
Loading…
Reference in a new issue