public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conky: Rely on XML_CATALOG_FILES variable

Browse Source
This commit is contained in:
Jan Tojnar 2017-10-07 13:07:52 +02:00
parent 407db7b019
commit 7c690aec16
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,10 +80,6 @@ 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/Docbook.cmake \
--replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl"
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"
substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)"
''; '';
@ -91,7 +87,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib cmake libXinerama ] buildInputs = [ glib cmake libXinerama ]
++ optionals docsSupport [ docbook2x libxslt man less ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses ++ optional ncursesSupport ncurses
++ optional x11Support xlibsWrapper ++ optional x11Support xlibsWrapper
++ optional xdamageSupport libXdamage ++ optional xdamageSupport libXdamage