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

Merge pull request #16873 from NeQuissimus/conky1_10_3

Browse Source 
conky: 1.10.1 -> 1.10.3
This commit is contained in:
Gabriel Ebner 2016-07-12 08:30:18 +02:00 committed by GitHub
commit 05315dc183
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake { stdenv, fetchFromGitHub, pkgconfig, cmake
# dependencies # dependencies
, glib , glib, libXinerama
# optional features without extra dependencies # optional features without extra dependencies
, mpdSupport ? true , mpdSupport ? true
@ -62,13 +62,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "conky-${version}"; name = "conky-${version}";
version = "1.10.1"; version = "1.10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brndnmtthws"; owner = "brndnmtthws";
repo = "conky"; repo = "conky";
rev = "v${version}"; rev = "v${version}";
sha256 = "0k93nqx8mxz2z84zzwpwfp7v7dwxwg1di1a2yb137lk7l157azw6"; sha256 = "0sa2jl159jk5p2hr37adwq84m0ynva7v87qrwj1xv0kw8l4qzhjs";
}; };
postPatch = '' postPatch = ''
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
buildInputs = [ pkgconfig glib cmake ] buildInputs = [ pkgconfig glib cmake libXinerama ]
++ optionals docsSupport [ docbook2x libxslt man less ] ++ optionals docsSupport [ docbook2x libxslt man less ]
++ optional ncursesSupport ncurses ++ optional ncursesSupport ncurses
++ optional x11Support xlibsWrapper ++ optional x11Support xlibsWrapper