From 880eba6481d112b934325f1e60033ffd3c6c3f53 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Nov 2015 05:28:26 +0100 Subject: [PATCH] conky: Fix building with CMake 3.4.0. Regression introduced by 050bebb8c47051b8d7de3dfee5807f11c9baff69. 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 --- pkgs/os-specific/linux/conky/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index b857d5ece451..62c883b6ab89 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -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 ]