Skip to content

conky: 1.13.1 -> 1.18.0 #217224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dguibert merged 3 commits into from
Jul 12, 2023
Merged

conky: 1.13.1 -> 1.18.0 #217224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ed537a
conky: 1.13.1 -> 1.18.0
Feb 19, 2023
c6e61dd
conky: lua 5.3 -> lua 5.4
May 28, 2023
eb25829
conky: clean up compiler flags
May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pkgs/os-specific/linux/conky/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ assert luaImlib2Support -> luaSupport && imlib2Support
assert luaCairoSupport -> luaSupport && toluapp != null
&& cairo != null;
assert luaCairoSupport || luaImlib2Support
-> lua.luaversion == "5.3";
-> lua.luaversion == "5.4";

assert wirelessSupport -> wirelesstools != null;
assert nvidiaSupport -> libXNVCtrl != null;
Expand All @@ -67,28 +67,30 @@ with lib;

stdenv.mkDerivation rec {
pname = "conky";
version = "1.13.1";
version = "1.18.0";

src = fetchFromGitHub {
owner = "brndnmtthws";
repo = "conky";
rev = "v${version}";
sha256 = "sha256-3eCRzjfHGFiKuxmRHvnzqAg/+ApUKnHhsumWnio/Qxg=";
sha256 = "sha256-a0RGgX325NztDcQwg9+ibxOstU0MSS3eSTaljgt9qPQ=";
};


postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
cmake/ConkyPlatformChecks.cmake
'' + optionalString docsSupport ''
# Drop examples, since they contain non-ASCII characters that break docbook2x :(
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";
env = {
# For some reason -Werror is on by default, causing the project to fail compilation.
NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = "-lgcc_s";
};

nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glib libXinerama ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25698,7 +25698,7 @@ with pkgs;
cockroachdb = callPackage ../servers/sql/cockroachdb { };

conky = callPackage ../os-specific/linux/conky ({
lua = lua5_3_compat;
lua = lua5_4;
inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
} // config.conky or {});

Expand Down