diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2017-11-25 15:53:30 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2017-11-25 15:57:40 +0100 |
| commit | 141644e752652fdf04132c87d31de1b7b2546105 (patch) | |
| tree | 6c64f8278121b4587fc1f8f1728aabaee0ede0f4 /pkgs/os-specific/linux/conky | |
| parent | 86278597936cc35743c3b8a41e2f16f9005b209c (diff) | |
| download | nixlib-141644e752652fdf04132c87d31de1b7b2546105.tar nixlib-141644e752652fdf04132c87d31de1b7b2546105.tar.gz nixlib-141644e752652fdf04132c87d31de1b7b2546105.tar.bz2 nixlib-141644e752652fdf04132c87d31de1b7b2546105.tar.lz nixlib-141644e752652fdf04132c87d31de1b7b2546105.tar.xz nixlib-141644e752652fdf04132c87d31de1b7b2546105.tar.zst nixlib-141644e752652fdf04132c87d31de1b7b2546105.zip | |
conky: fix compilation with gcc-7
Diffstat (limited to 'pkgs/os-specific/linux/conky')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 8aa1cec9e12f..fd585515cf02 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake # dependencies , glib, libXinerama @@ -73,6 +73,16 @@ stdenv.mkDerivation rec { sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; }; + patches = [ + # Patch to fix compilation on gcc-7 from conky PR + # https://github.com/brndnmtthws/conky/pull/402 + (fetchpatch { + name = "gcc7.patch"; + url = "https://github.com/brndnmtthws/conky/commit/6140122b82d50acc333e5d2a813cc1933ecc6d21.patch"; + sha256 = "1fblfj1w2kc0gshc2pq9lc1pxxsgmgh8byb1xs2v6amx15kj11k7"; + }) + ]; + postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake |