public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conky: 1.10.6 -> 1.10.7

Browse Source
This commit is contained in:
Franz Pletz 2018-01-28 02:35:19 +01:00
parent 708f2ca55f
commit 943e32abb7
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/conky/default.nix
View File

@ -64,25 +64,15 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "conky-${version}"; name = "conky-${version}";
version = "1.10.6"; version = "1.10.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brndnmtthws"; owner = "brndnmtthws";
repo = "conky"; repo = "conky";
rev = "v${version}"; rev = "v${version}";
sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; sha256 = "1qx47m4c1j3wh1hmbn2h8wyvg0ncr3kz1zcdj9si2bdyz3s0i9w7";
}; };
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 = '' postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
cmake/ConkyPlatformChecks.cmake cmake/ConkyPlatformChecks.cmake
@ -95,8 +85,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ glib cmake libXinerama ] buildInputs = [ glib libXinerama ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses ++ optional ncursesSupport ncurses
++ optional x11Support xlibsWrapper ++ optional x11Support xlibsWrapper