From 5fb0d70e96d9af58c46e01d4ebf843ffcd233274 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Fri, 23 Feb 2024 09:31:18 -0500 Subject: [PATCH 1/2] Enable lua bindings in nix flake --- flake.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 836f1c9ba..9ab99fddb 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation rec { name = "conky"; src = ./.; + cmakeFlags = [ + "-BUILD_LUA_CAIRO=ON" + "-BUILD_LUA_IMLIB2=ON" + "-BUILD_LUA_RSVG=ON" + ]; nativeBuildInputs = [ clang_16 cmake @@ -62,9 +67,11 @@ ]; buildInputs = [ + cairo freetype gettext imlib2 + librsvg llvmPackages_16.libcxx llvmPackages_16.libcxxabi lua5_4 @@ -72,13 +79,13 @@ xorg.libICE xorg.libSM xorg.libX11 + xorg.libxcb xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXft - xorg.libXinerama xorg.libXi - xorg.libxcb + xorg.libXinerama xorg.xcbutilerrors ] ++ lib.optional stdenv.isDarwin darwin.libobjc; From b05b0d69a54437d09cca845adc1c66dba7858cd3 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Fri, 23 Feb 2024 10:10:20 -0500 Subject: [PATCH 2/2] Derp, fix these --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 9ab99fddb..3767a4d0a 100644 --- a/flake.nix +++ b/flake.nix @@ -53,9 +53,9 @@ name = "conky"; src = ./.; cmakeFlags = [ - "-BUILD_LUA_CAIRO=ON" - "-BUILD_LUA_IMLIB2=ON" - "-BUILD_LUA_RSVG=ON" + "-DBUILD_LUA_CAIRO=ON" + "-DBUILD_LUA_IMLIB2=ON" + "-DBUILD_LUA_RSVG=ON" ]; nativeBuildInputs = [ clang_16