From b9be46fb3115dffcd5cdaa62523bd025c7342e42 Mon Sep 17 00:00:00 2001 From: Qyriad Date: Tue, 7 May 2024 13:34:36 -0600 Subject: remove the autoconf+Make buildsystem We're not using it anymore. Any leftover bugs in the Meson buildsystem are now just bugs. Closes #249. Change-Id: I0465a0c37ae819f94d40e7829f5bff046aa63d73 --- perl/default.nix | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) (limited to 'perl/default.nix') diff --git a/perl/default.nix b/perl/default.nix index af700eabe..7ce418402 100644 --- a/perl/default.nix +++ b/perl/default.nix @@ -4,8 +4,6 @@ stdenv, perl, perlPackages, - autoconf-archive, - autoreconfHook, pkg-config, nix, curl, @@ -16,7 +14,6 @@ darwin, meson, ninja, - buildWithMeson ? false, }: perl.pkgs.toPerlModule ( @@ -25,36 +22,18 @@ perl.pkgs.toPerlModule ( src = fileset.toSource { root = ../.; - fileset = fileset.unions ( - [ - ../.version - ./lib - ] - ++ lib.optionals (!buildWithMeson) [ - # FIXME(Qyriad): What the hell is this? - # What is it used for and do we still need it? - ./MANIFEST - ../m4 - ../mk - ./Makefile - ./Makefile.config.in - ./configure.ac - ./local.mk - ] - ++ lib.optionals buildWithMeson [ ./meson.build ] - ); + fileset = fileset.unions ([ + ../.version + ./lib + ./meson.build + ]); }; - nativeBuildInputs = - [ pkg-config ] - ++ lib.optionals (!buildWithMeson) [ - autoconf-archive - autoreconfHook - ] - ++ lib.optionals buildWithMeson [ - meson - ninja - ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; buildInputs = [ -- cgit v1.2.3