Skip to content

Commit

Permalink
sys-apps/nix: provide missing m4 files from autoconf-archive
Browse files Browse the repository at this point in the history
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

Reported-by: Daryl Anthony Chouinard
Closes: #8
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <[email protected]>
  • Loading branch information
Sergei Trofimovich committed Jun 4, 2020
1 parent 9e18cb5 commit bda7aa4
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
8 changes: 8 additions & 0 deletions sys-apps/nix/nix-2.3.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions sys-apps/nix/nix-2.3.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions sys-apps/nix/nix-2.3.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bda7aa4

Please sign in to comment.