JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26700 from gleber/fix-qmakeHook

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/feedreaders/rssguard/default.nix
View File

@ -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; {

4
pkgs/tools/misc/ultrastar-creator/default.nix
View File

@ -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; {

4
pkgs/tools/misc/ultrastar-manager/default.nix
View File

@ -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|" \