diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-14 15:16:18 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:26:50 +0100 |
| commit | 0bdcc484855b74fc50f2f821e81ee9518550a4cb (patch) | |
| tree | a141bee60b376279dbfe4f1745cf8a940328e4a7 /pkgs/os-specific/linux/conky | |
| parent | 40fc0090fc5442d8dd67423284282548625618a6 (diff) | |
| download | nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.tar nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.tar.gz nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.tar.bz2 nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.tar.lz nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.tar.xz nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.tar.zst nixpkgs-0bdcc484855b74fc50f2f821e81ee9518550a4cb.zip | |
conky: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/155171697
Diffstat (limited to 'pkgs/os-specific/linux/conky')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 9bd8890e713..87f5bb052f4 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,7 +1,7 @@ { config, lib, stdenv, fetchFromGitHub, pkg-config, cmake # dependencies -, glib, libXinerama +, glib, libXinerama, catch2 # optional features without extra dependencies , mpdSupport ? true @@ -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"; @@ -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"; |