diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-28 02:35:19 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-28 18:52:23 +0100 |
| commit | 943e32abb7999e50d0cb6f2548965ea1bd7368b3 (patch) | |
| tree | f75209311f9f55a2e3e3bf01285405df9f93e8a4 /pkgs/os-specific/linux/conky | |
| parent | 708f2ca55f70c52c6d71788bbc623b5d3081ef06 (diff) | |
| download | nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.tar nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.tar.gz nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.tar.bz2 nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.tar.lz nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.tar.xz nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.tar.zst nixpkgs-943e32abb7999e50d0cb6f2548965ea1bd7368b3.zip | |
conky: 1.10.6 -> 1.10.7
Diffstat (limited to 'pkgs/os-specific/linux/conky')
| -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 b7a8dc23a78..93681b2e18c 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 |