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

qt5: rename qmakeHook to qmake

Browse Source
This commit is contained in:
Thomas Tuegel
2017-06-02 10:40:19 -05:00
parent 3f3d33a078
commit 210f688802
65 changed files with 165 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/ckb/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }:
{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }:
stdenv.mkDerivation rec {
version = "0.2.6";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig
qmakeHook
qmake
];
patches = [

5
pkgs/tools/misc/qt5ct/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper }:
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
stdenv.mkDerivation rec {
name = "qt5ct-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
};
nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
propagatedBuildInputs = [ qtbase qtsvg qttools ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtsvg ];

4
pkgs/tools/misc/radeon-profile/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeQtWrapper, libXrandr }:
{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
stdenv.mkDerivation rec {
name = "radeon-profile-${version}";
version = "20161221";
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
nativeBuildInputs = [ qmake makeQtWrapper ];
buildInputs = [ qtbase libXrandr ];
src = (fetchFromGitHub {

4
pkgs/tools/misc/rockbox-utility/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libusb1
, qtbase, qttools, makeQtWrapper, qmakeHook
, qtbase, qttools, makeQtWrapper, qmake
, withEspeak ? false, espeak ? null }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 qtbase qttools ]
++ stdenv.lib.optional withEspeak espeak;
nativeBuildInputs = [ makeQtWrapper pkgconfig qmakeHook ];
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
preConfigure = ''
cd rbutil/rbutilqt

4
pkgs/tools/networking/cmst/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }:
{ stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }:
stdenv.mkDerivation rec {
name = "cmst-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545";
};
nativeBuildInputs = [ makeWrapper qmakeHook ];
nativeBuildInputs = [ makeWrapper qmake ];
buildInputs = [ qtbase ];