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

Merge pull request #12439 from k0ral/conky

Browse Source 
conky: 1.10.0 -> 1.10.1
This commit is contained in:
Pascal Wittmann 2016-01-17 11:54:34 +01:00
commit 57469df20b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,13 +61,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "conky-${version}"; name = "conky-${version}";
version = "1.10.0"; version = "1.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brndnmtthws"; owner = "brndnmtthws";
repo = "conky"; repo = "conky";
rev = "v${version}"; rev = "v${version}";
sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn"; sha256 = "0k93nqx8mxz2z84zzwpwfp7v7dwxwg1di1a2yb137lk7l157azw6";
}; };
postPatch = '' postPatch = ''
@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
--replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl"
substituteInPlace doc/docs.xml \ substituteInPlace doc/docs.xml \
--replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd"
substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)"
''; '';
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";