summary refs log tree commit diff
path: root/pkgs/os-specific/linux/conky/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-11-17 05:28:26 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-11-17 05:51:27 +0100
commit880eba6481d112b934325f1e60033ffd3c6c3f53 (patch)
treef274c95816ef3c60db68614b274a977716f9b126 /pkgs/os-specific/linux/conky/default.nix
parent17044e0e715e5312078f508ee21a50334390b20f (diff)
downloadnixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.tar
nixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.tar.gz
nixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.tar.bz2
nixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.tar.lz
nixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.tar.xz
nixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.tar.zst
nixpkgs-880eba6481d112b934325f1e60033ffd3c6c3f53.zip
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux/conky/default.nix')
-rw-r--r--pkgs/os-specific/linux/conky/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index b857d5ece45..62c883b6ab8 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 ]