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-18 08:41:57 -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
pkgs/applications/misc/golden-cheetah/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
, yacc, flex, zlib, config, qmakeHook, makeQtWrapper
, yacc, flex, zlib, config, qmake, makeQtWrapper
}:
stdenv.mkDerivation rec {
name = "golden-cheetah-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
qtconnectivity
];
nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs;
nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
preConfigure = ''
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri