pyrox.dev
lol
Merge pull request #26700 from gleber/fix-qmakeHook
qt: fix qmakeHook -> qmake in few packages.
authored by
Daiderd Jordan
and committed by
GitHub
59634a66
89e02c75
+2
-2
pkgs/applications/networking/feedreaders/rssguard/default.nix
+2
-2
pkgs/applications/networking/feedreaders/rssguard/default.nix
···
1
-
{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
1
+
{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "rssguard-${version}";
···
12
12
};
13
13
14
14
buildInputs = [ qtwebengine qttools ];
15
-
nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
15
+
nativeBuildInputs = [ qmake wrapGAppsHook ];
16
16
qmakeFlags = [ "CONFIG+=release" ];
17
17
18
18
meta = with stdenv.lib; {
+2
-2
pkgs/tools/misc/ultrastar-creator/default.nix
+2
-2
pkgs/tools/misc/ultrastar-creator/default.nix
···
1
1
{ stdenv, fetchFromGitHub
2
-
, qmakeHook, qtbase, makeQtWrapper
2
+
, qmake, qtbase, makeQtWrapper
3
3
, pkgconfig, taglib, libbass, libbass_fx }:
4
4
5
5
stdenv.mkDerivation rec {
···
29
29
cd src
30
30
'';
31
31
32
-
nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
32
+
nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
33
33
buildInputs = [ qtbase taglib libbass libbass_fx ];
34
34
35
35
meta = with stdenv.lib; {
+2
-2
pkgs/tools/misc/ultrastar-manager/default.nix
+2
-2
pkgs/tools/misc/ultrastar-manager/default.nix
···
1
-
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
1
+
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
2
2
, qtbase, qtmultimedia, makeQtWrapper
3
3
, taglib, libmediainfo, libzen, libbass }:
4
4
···
60
60
name = "ultrastar-manager-${name}-plugin-${version}";
61
61
src = patchedSrc;
62
62
63
-
buildInputs = [ qmakeHook ] ++ buildInputs;
63
+
buildInputs = [ qmake ] ++ buildInputs;
64
64
65
65
postPatch = ''
66
66
sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \