pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

nix: fix config.nix, still needs further fixes.



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Sat Aug 1 21:39:23 2020 +0200
Changeset:	94c07465828e0db3d6a522928f78b430d2a42a88

Modified Files:
	nix/Makefile

Log Message:
nix: fix config.nix, still needs further fixes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=94c07465828e0db3d6a522928f78b430d2a42a88

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nix/Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index 1123bd6cf7..20617b094a 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -76,6 +76,15 @@ SUBST_FILES.docbook2+=	doc/manual/local.mk
 SUBST_STAGE.docbook2=	pre-configure
 SUBST_SED.docbook2+=	-e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
 
+# remove workdir references
+SUBST_CLASSES+=			confignix
+SUBST_MESSAGE.confignix=	remove workdir references
+SUBST_FILES.confignix+=		corepkgs/config.nix.in
+SUBST_STAGE.confignix=		post-configure
+SUBST_SED.confignix+=		-e 's,@bash@,${PREFIX}/bin/bash,g'
+SUBST_SED.confignix+=		-e 's,@coreutils@,/bin,g'
+SUBST_SED.confignix+=		-e 's,@tr@,/usr/bin/tr,g'
+
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 


Home | Main Index | Thread Index | Old Index