dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

conky: 1.11.1 -> 1.11.2

Browse Source
This commit is contained in:
Tim Steinbach 2019-01-25 22:57:53 -05:00
parent 9e3db4df2c
commit 3da56c7844
No known key found for this signature in database
GPG Key ID: 6C654787275A64F1
2 changed files with 5 additions and 5 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

@ -51,7 +51,7 @@ assert luaImlib2Support -> luaSupport && imlib2Support
assert luaCairoSupport -> luaSupport && toluapp != null assert luaCairoSupport -> luaSupport && toluapp != null
&& cairo != null; && cairo != null;
assert luaCairoSupport || luaImlib2Support assert luaCairoSupport || luaImlib2Support
-> lua.luaversion == "5.1"; -> lua.luaversion == "5.3";
assert wirelessSupport -> wirelesstools != null; assert wirelessSupport -> wirelesstools != null;
assert nvidiaSupport -> libXNVCtrl != null; assert nvidiaSupport -> libXNVCtrl != null;
@ -66,13 +66,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "conky-${version}"; name = "conky-${version}";
version = "1.11.1"; version = "1.11.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brndnmtthws"; owner = "brndnmtthws";
repo = "conky"; repo = "conky";
rev = "v${version}"; rev = "v${version}";
sha256 = "00ghxzg78mp7w2y9cxhsdmkab2n7vfg76p6zihiglb2x3h2gjm5x"; sha256 = "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx";
}; };
postPatch = '' postPatch = ''
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
# Drop examples, since they contain non-ASCII characters that break docbook2x :( # Drop examples, since they contain non-ASCII characters that break docbook2x :(
sed -i 's/ Example: .*$//' doc/config_settings.xml sed -i 's/ Example: .*$//' doc/config_settings.xml
substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
''; '';
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";

2
pkgs/top-level/all-packages.nix
View File

@ -14340,7 +14340,7 @@ in
cockroachdb = callPackage ../servers/sql/cockroachdb { }; cockroachdb = callPackage ../servers/sql/cockroachdb { };
conky = callPackage ../os-specific/linux/conky ({ conky = callPackage ../os-specific/linux/conky ({
lua = lua5_1; # conky can use 5.2, but toluapp can not lua = lua5_3_compat;
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
} // config.conky or {}); } // config.conky or {});