From 080164905c75446319f24def2231d7ea877eb073 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 12:23:11 -0400 Subject: [PATCH] docbook_xml_dtd_*: unzip is a nativeBuildInput [dezgeg resolved a merge conflict] Conflicts: pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix --- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 373778d43de6..7c3db50010cd 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -5,8 +5,8 @@ assert unzip != null; stdenv.mkDerivation { inherit src name postInstall; builder = ./builder.sh; - buildInputs = [unzip]; - propagatedBuildInputs = [ findXMLCatalogs ]; + nativeBuildInputs = [unzip]; + propagatedNativeBuildInputs = [ findXMLCatalogs ]; meta = meta // { platforms = stdenv.lib.platforms.unix;