From cb64fcc78730879189ab78dc9f792c238361799f Mon Sep 17 00:00:00 2001 From: Valter Nazianzeno Date: Fri, 8 Dec 2023 10:56:13 -0300 Subject: emilua: 0.4.3 -> 0.5.1 --- pkgs/development/interpreters/emilua/default.nix | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index a938d19736ec5..341888f6cda78 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -7,7 +7,6 @@ , re2c , gperf , gawk -, xxd , pkg-config , boost182 , fmt @@ -18,6 +17,8 @@ , libcap , liburing , openssl +, cereal +, cmake , asciidoctor }: @@ -40,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "emilua"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitLab { owner = "emilua"; repo = "emilua"; rev = "v${version}"; - hash = "sha256-vZITPQ1qUHhw24c0HKdR6VenviOc6JizQQ8w7K94irc="; + hash = "sha256-5NzxZHdQGw3qLEzW/mv1sLCuqehn5pjUYkCna4PUzDQ="; }; buildInputs = [ @@ -59,19 +60,22 @@ stdenv.mkDerivation rec { libcap liburing openssl + cereal ]; nativeBuildInputs = [ re2c gperf gawk - xxd pkg-config asciidoctor meson + cmake ninja ]; + dontUseCmakeConfigure = true; + # Meson is no longer able to pick up Boost automatically. # https://github.com/NixOS/nixpkgs/issues/86131 env = { @@ -80,13 +84,12 @@ stdenv.mkDerivation rec { }; mesonFlags = [ - "-Dversion_suffix=-nixpkgs1" - "-Denable_http=true" - "-Denable_file_io=true" - "-Denable_io_uring=true" - "-Denable_linux_namespaces=true" - "-Denable_tests=true" - "-Denable_manpages=true" + (lib.mesonOption "version_suffix" "-nixpkgs1") + (lib.mesonBool "enable_http" true) + (lib.mesonBool "enable_file_io" true) + (lib.mesonBool "enable_io_uring" true) + (lib.mesonBool "enable_tests" true) + (lib.mesonBool "enable_manpages" true) ]; postPatch = '' -- cgit 1.4.1