3
0
Fork 0
forked from mirrors/nixpkgs

conky: Fix building with CMake 3.4.0.

Regression introduced by 050bebb8c4.

It's essentially an upgrade to CMake 3.4.0, which breaks the build
because it seems that in CMake 3.3.x, the check_include_files() command
was implicitly included (haven't found out about why exactly).

So we're now just adding an import for CheckIncludeFiles in addition to
CheckIncludeFile, so that we have both commands (the plural and the
singular variant) available.

My original goal was to use brndnmtthws/conky@3a574ba, but this breaks
the build as well, because check_include_files doesn't accept additional
compile flags.

However, this is needed if building with wireless support, because
including iwlib.h needs -D_GNU_SOURCE set and check_include_files
doesn't do that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-11-17 05:28:26 +01:00
parent 17044e0e71
commit 880eba6481
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961

View file

@ -60,6 +60,11 @@ stdenv.mkDerivation rec {
sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn";
};
postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
cmake/ConkyPlatformChecks.cmake
'';
NIX_LDFLAGS = "-lgcc_s";
buildInputs = [ pkgconfig glib cmake ]