diff --git a/sys-apps/nix/nix-2.3.4.ebuild b/sys-apps/nix/nix-2.3.4.ebuild index 4a29df6..de62631 100644 --- a/sys-apps/nix/nix-2.3.4.ebuild +++ b/sys-apps/nix/nix-2.3.4.ebuild @@ -40,6 +40,14 @@ DEPEND="${RDEPEND} >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 " +# https://github.com/trofi/nix-guix-gentoo/issues/8 +# Account for missing upstream m4 files from tarball: +# dev-util/pkgconfig: m4/pkg.m4 +# sys-devel/autoconf-archive: m4/ax_boost_base.m4, m4/ax_require_defined.m4 +DEPEND+=" + sys-devel/autoconf-archive + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-2.3-libpaths.patch diff --git a/sys-apps/nix/nix-2.3.5.ebuild b/sys-apps/nix/nix-2.3.5.ebuild index 4a29df6..de62631 100644 --- a/sys-apps/nix/nix-2.3.5.ebuild +++ b/sys-apps/nix/nix-2.3.5.ebuild @@ -40,6 +40,14 @@ DEPEND="${RDEPEND} >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 " +# https://github.com/trofi/nix-guix-gentoo/issues/8 +# Account for missing upstream m4 files from tarball: +# dev-util/pkgconfig: m4/pkg.m4 +# sys-devel/autoconf-archive: m4/ax_boost_base.m4, m4/ax_require_defined.m4 +DEPEND+=" + sys-devel/autoconf-archive + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-2.3-libpaths.patch diff --git a/sys-apps/nix/nix-2.3.6.ebuild b/sys-apps/nix/nix-2.3.6.ebuild index 4a29df6..92a61c4 100644 --- a/sys-apps/nix/nix-2.3.6.ebuild +++ b/sys-apps/nix/nix-2.3.6.ebuild @@ -41,6 +41,15 @@ DEPEND="${RDEPEND} >=sys-devel/flex-2.5.35 " +# https://github.com/trofi/nix-guix-gentoo/issues/8 +# Account for missing upstream m4 files from tarball: +# dev-util/pkgconfig: m4/pkg.m4 +# sys-devel/autoconf-archive: m4/ax_boost_base.m4, m4/ax_require_defined.m4 +DEPEND+=" + sys-devel/autoconf-archive + virtual/pkgconfig +" + PATCHES=( "${FILESDIR}"/${PN}-2.3-libpaths.patch "${FILESDIR}"/${PN}-2.3-bootstrap.patch