conky: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/155171697
This commit is contained in:
parent
40fc0090fc
commit
0bdcc48485
|
@ -1,7 +1,7 @@
|
||||||
{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake
|
{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake
|
||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
, glib, libXinerama
|
, glib, libXinerama, catch2
|
||||||
|
|
||||||
# optional features without extra dependencies
|
# optional features without extra dependencies
|
||||||
, mpdSupport ? true
|
, mpdSupport ? true
|
||||||
|
@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
|
||||||
sed -i 's/ Example: .*$//' doc/config_settings.xml
|
sed -i 's/ Example: .*$//' doc/config_settings.xml
|
||||||
|
|
||||||
substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
|
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";
|
NIX_LDFLAGS = "-lgcc_s";
|
||||||
|
@ -133,6 +135,8 @@ stdenv.mkDerivation rec {
|
||||||
# src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory
|
# src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory
|
||||||
enableParallelBuilding = false;
|
enableParallelBuilding = false;
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://conky.sourceforge.net/";
|
homepage = "http://conky.sourceforge.net/";
|
||||||
description = "Advanced, highly configurable system monitor based on torsmo";
|
description = "Advanced, highly configurable system monitor based on torsmo";
|
||||||
|
|
Loading…
Reference in a new issue