b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

conky: clean up compiler flags

Browse source
This commit is contained in:
tranquillity-codes 2023-05-31 00:57:33 +02:00 committed by David Guibert
parent dc1cfc59ef
commit 212f20a907
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/os-specific/linux/conky/default.nix
View file

@ -76,11 +76,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-a0RGgX325NztDcQwg9+ibxOstU0MSS3eSTaljgt9qPQ=";
};
# For some reason -Werror is on by default, causing the project to fail compilation.
buildPhase = ''
make
'';
NIX_CFLAGS_COMPILE = "-Wno-error";
postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
@ -91,7 +86,11 @@ stdenv.mkDerivation rec {
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 ]