pyrox.dev
conky: 1.10.6 -> 1.10.7
+4
-14
pkgs/os-specific/linux/conky/default.nix
+4
-14
pkgs/os-specific/linux/conky/default.nix
···
64
64
65
65
stdenv.mkDerivation rec {
66
66
name = "conky-${version}";
67
-
version = "1.10.6";
67
+
version = "1.10.7";
68
68
69
69
src = fetchFromGitHub {
70
70
owner = "brndnmtthws";
71
71
repo = "conky";
72
72
rev = "v${version}";
73
-
sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8";
73
+
sha256 = "1qx47m4c1j3wh1hmbn2h8wyvg0ncr3kz1zcdj9si2bdyz3s0i9w7";
74
74
};
75
75
76
-
patches = [
77
-
# Patch to fix compilation on gcc-7 from conky PR
78
-
# https://github.com/brndnmtthws/conky/pull/402
79
-
(fetchpatch {
80
-
name = "gcc7.patch";
81
-
url = "https://github.com/brndnmtthws/conky/commit/6140122b82d50acc333e5d2a813cc1933ecc6d21.patch";
82
-
sha256 = "1fblfj1w2kc0gshc2pq9lc1pxxsgmgh8byb1xs2v6amx15kj11k7";
83
-
})
84
-
];
85
-
86
76
postPatch = ''
87
77
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
88
78
cmake/ConkyPlatformChecks.cmake
···
95
85
96
86
NIX_LDFLAGS = "-lgcc_s";
97
87
98
-
nativeBuildInputs = [ pkgconfig ];
99
-
buildInputs = [ glib cmake libXinerama ]
88
+
nativeBuildInputs = [ cmake pkgconfig ];
89
+
buildInputs = [ glib libXinerama ]
100
90
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
101
91
++ optional ncursesSupport ncurses
102
92
++ optional x11Support xlibsWrapper