From 212f20a9071aaed1e70084f069b608502ce04651 Mon Sep 17 00:00:00 2001
From: tranquillity-codes <dev@itycodes.org>
Date: Wed, 31 May 2023 00:57:33 +0200
Subject: conky: clean up compiler flags

---
 pkgs/os-specific/linux/conky/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/os-specific/linux/conky/default.nix')

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index a9ac58d13e3de..68b174dba5b3e 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -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 ]
-- 
cgit 1.4.1