From 2fb67d9b83f2b6ab1632c3e89c7a91aae603ee7e Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 18 Jun 2017 19:32:51 +0200 Subject: [PATCH] qt: fix qmakeHook -> qmake in few packages. This seem to have been broken in #26336. --- pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++-- pkgs/tools/misc/ultrastar-creator/default.nix | 4 ++-- pkgs/tools/misc/ultrastar-manager/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index a9e3c1d74e26..d1c272fc3831 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -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; { diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 0700c43b26e5..197c05366035 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -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; { diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 61b2c6aaa228..503ffe735fdd 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -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|" \