diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
| commit | c9171e5a4c3e61f9afa0e3da3755712d1da5d693 (patch) | |
| tree | 89b09dee818b612c9c52fb92d79b7169f1202006 /pkgs/os-specific/linux/conky/default.nix | |
| parent | e851d53ceaf2cd48d0757c385626dd2040db0f12 (diff) | |
| parent | 078fc69425787c9ceebfa003add3c1d80e49560c (diff) | |
| download | nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.gz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.bz2 nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.lz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.xz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.zst nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1430035
Diffstat (limited to 'pkgs/os-specific/linux/conky/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index b7a8dc23a787..93681b2e18c7 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -64,25 +64,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; 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 = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake @@ -95,8 +85,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib cmake libXinerama ] + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper |