diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-09-10 23:34:44 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-09-10 23:53:59 +0200 |
| commit | 3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce (patch) | |
| tree | 61a781b3e3533cc62b2e9fd583f1a8572668a186 /pkgs/os-specific | |
| parent | b2b67c055b048c0db9dea06a219b8ef87d5dbbfc (diff) | |
| download | nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.tar nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.tar.gz nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.tar.bz2 nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.tar.lz nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.tar.xz nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.tar.zst nixpkgs-3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce.zip | |
conky: Patch to #include <stdbool.h> in conky.c.
In current upstream master, they converted conky.c to C++ already, so it's not an issue there anymore. But until then we need to patch it on our own to fix the build. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/conky/stdbool.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 94c7e72f0e2..f5cccff6650 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; + patches = [ ./stdbool.patch ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; configureFlags = (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch new file mode 100644 index 00000000000..3f0b714a1f0 --- /dev/null +++ b/pkgs/os-specific/linux/conky/stdbool.patch @@ -0,0 +1,12 @@ +diff --git a/src/conky.c b/src/conky.c +index 5848b61..69a3d45 100644 +--- a/src/conky.c ++++ b/src/conky.c +@@ -34,6 +34,7 @@ + #include "common.h" + #include "timed_thread.h" + #include <stdarg.h> ++#include <stdbool.h> + #include <math.h> + #include <time.h> + #include <locale.h> |