docbook_{xml,xsl}*: propagate findXMLCatalogs

This commit is contained in:
Jan Tojnar 2017-10-07 00:05:38 +02:00
parent 2c9c04fe47
commit 99af040ee1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
7 changed files with 15 additions and 12 deletions

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchurl, unzip, findXMLCatalogs}:
let
@ -12,7 +12,7 @@ let
in
import ./generic.nix {
inherit stdenv fetchurl unzip;
inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.1.2";
src = fetchurl {
url = http://www.docbook.org/xml/4.1.2/docbkx412.zip;

View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
inherit stdenv fetchurl unzip;
inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.2";
src = fetchurl {
url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;

View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
inherit stdenv fetchurl unzip;
inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.3";
src = fetchurl {
url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;

View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
inherit stdenv fetchurl unzip;
inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.4";
src = fetchurl {
url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip;

View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
inherit stdenv fetchurl unzip;
inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.5";
src = fetchurl {
url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }:
{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
assert unzip != null;
@ -6,6 +6,7 @@ stdenv.mkDerivation {
inherit src name postInstall;
builder = ./builder.sh;
buildInputs = [unzip];
propagatedBuildInputs = [ findXMLCatalogs ];
meta = meta // {
platforms = stdenv.lib.platforms.unix;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchurl, findXMLCatalogs }:
let
@ -10,6 +10,8 @@ let
inherit sha256;
};
propagatedBuildInputs = [ findXMLCatalogs ];
dontBuild = true;
installPhase = ''