diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-10-07 13:07:52 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-10-07 23:38:32 +0200 |
| commit | 7c690aec1619fe85ef5c8bfbf05374597aceff1d (patch) | |
| tree | 177c2c230d9a730c5b34fe8cf62439c2c4e8593f /pkgs/os-specific/linux/conky | |
| parent | 407db7b0196417296677f2a4ef929bb092ec382b (diff) | |
| download | nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.tar nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.tar.gz nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.tar.bz2 nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.tar.lz nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.tar.xz nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.tar.zst nixpkgs-7c690aec1619fe85ef5c8bfbf05374597aceff1d.zip | |
conky: Rely on XML_CATALOG_FILES variable
Diffstat (limited to 'pkgs/os-specific/linux/conky')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index c09fc0f7dc4..8aa1cec9e12 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -80,10 +80,6 @@ stdenv.mkDerivation rec { # Drop examples, since they contain non-ASCII characters that break docbook2x :( 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)" ''; @@ -91,7 +87,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; 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 x11Support xlibsWrapper ++ optional xdamageSupport libXdamage |