Skip to content

Commit

Permalink
conky: fix build w/glibc-2.34
Browse files Browse the repository at this point in the history
  • Loading branch information
Ma27 committed Feb 27, 2022
1 parent 40fc009 commit 0bdcc48
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkgs/os-specific/linux/conky/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake

# dependencies
, glib, libXinerama
, glib, libXinerama, catch2

# optional features without extra dependencies
, mpdSupport ? true
Expand Down Expand Up @@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
sed -i 's/ Example: .*$//' doc/config_settings.xml
substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
'';

NIX_LDFLAGS = "-lgcc_s";
Expand Down Expand Up @@ -133,6 +135,8 @@ stdenv.mkDerivation rec {
# src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory
enableParallelBuilding = false;

doCheck = true;

meta = with lib; {
homepage = "http://conky.sourceforge.net/";
description = "Advanced, highly configurable system monitor based on torsmo";
Expand Down

0 comments on commit 0bdcc48

Please sign in to comment.