extra-cmake-modules: Lift Qt dependency

This commit is contained in:
Thomas Tuegel
2017-02-26 06:49:15 -06:00
parent b39e491eb5
commit 127bf18a35
168 changed files with 493 additions and 455 deletions

View File

@@ -1,5 +1,5 @@
{
stdenv, fetchFromGitHub, cmake, ecm,
stdenv, fetchFromGitHub, cmake, extra-cmake-modules,
zlib, boost162, libunwind, elfutils, sparsehash,
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons,
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0dqchd2r4khv9gzj4n0qjii2nqygkj5jclkji8jbvivx5qwsqznc";
};
nativeBuildInputs = [ cmake ecm ];
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [
zlib boost162 libunwind elfutils sparsehash
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons

View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, ecm, makeQtWrapper
{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper
, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
let
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [
cmake ecm makeQtWrapper
cmake extra-cmake-modules makeQtWrapper
boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
];