Merge pull request #26700 from gleber/fix-qmakeHook

qt: fix qmakeHook -> qmake in few packages.
This commit is contained in:
Daiderd Jordan 2017-06-18 21:31:12 +02:00 committed by GitHub
commit 59634a6639
3 changed files with 6 additions and 6 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }: { stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rssguard-${version}"; name = "rssguard-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ qtwebengine qttools ]; buildInputs = [ qtwebengine qttools ];
nativeBuildInputs = [ qmakeHook wrapGAppsHook ]; nativeBuildInputs = [ qmake wrapGAppsHook ];
qmakeFlags = [ "CONFIG+=release" ]; qmakeFlags = [ "CONFIG+=release" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, qmakeHook, qtbase, makeQtWrapper , qmake, qtbase, makeQtWrapper
, pkgconfig, taglib, libbass, libbass_fx }: , pkgconfig, taglib, libbass, libbass_fx }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cd src cd src
''; '';
nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ]; nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
buildInputs = [ qtbase taglib libbass libbass_fx ]; buildInputs = [ qtbase taglib libbass libbass_fx ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins { stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
, qtbase, qtmultimedia, makeQtWrapper , qtbase, qtmultimedia, makeQtWrapper
, taglib, libmediainfo, libzen, libbass }: , taglib, libmediainfo, libzen, libbass }:
@ -60,7 +60,7 @@ let
name = "ultrastar-manager-${name}-plugin-${version}"; name = "ultrastar-manager-${name}-plugin-${version}";
src = patchedSrc; src = patchedSrc;
buildInputs = [ qmakeHook ] ++ buildInputs; buildInputs = [ qmake ] ++ buildInputs;
postPatch = '' postPatch = ''
sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \ sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \