From d8141bc059cb0a7aaa3329bad24c5226d46b4e71 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 11:01:32 -0600 Subject: irker: cleanup manual setting of XML_CATALOG_FILES, no longer needed --- pkgs/servers/irker/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 6ad233593a3b..002760ff0fd3 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; }; - nativeBuildInputs = [ pkgconfig xmlto docbook2x ]; + nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ python @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { # python.pkgs.pysocks ]; - preBuild = '' - export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml' - ''; - postPatch = '' substituteInPlace Makefile \ --replace '-o 0 -g 0' "" -- cgit 1.4.1