diff options
| author | tranquillity-codes <dev@itycodes.org> | 2023-05-31 00:57:33 +0200 |
|---|---|---|
| committer | David Guibert <david.guibert@gmail.com> | 2023-07-12 07:55:13 +0200 |
| commit | 212f20a9071aaed1e70084f069b608502ce04651 (patch) | |
| tree | 5ac13d8fc05c6df022f0c73aa87c6fc3434b04fd /pkgs/os-specific/linux/conky | |
| parent | dc1cfc59efbe07dfefcc46af6e8442f234922e6e (diff) | |
| download | nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.tar nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.tar.gz nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.tar.bz2 nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.tar.lz nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.tar.xz nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.tar.zst nixpkgs-212f20a9071aaed1e70084f069b608502ce04651.zip | |
conky: clean up compiler flags
Diffstat (limited to 'pkgs/os-specific/linux/conky')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index a9ac58d13e3..68b174dba5b 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 ] |