swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32028 from andir/gcc-7-conky

Browse source 
conky: fix compilation with gcc-7
This commit is contained in:
adisbladis 2017-11-25 23:18:50 +08:00 committed by GitHub
parent 8627859793 141644e752
commit bfaf22a9df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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