From 42bbff54242095d30ceed6cef23f53a66bf769d8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Jun 2023 04:20:00 +0000 Subject: [PATCH] mruby: refactor - Remove bison from nativeBuildInputs, since it's only required to build parse.y - Move ruby to nativeCheckInputs --- pkgs/development/compilers/mruby/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 6cebeed7378e..f268fe2f1e6c 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }: +{ lib, stdenv, ruby, rake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mruby"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA="; }; - nativeBuildInputs = [ ruby bison rake ]; + nativeBuildInputs = [ rake ]; + + nativeCheckInputs = [ ruby ]; # Necessary so it uses `gcc` instead of `ld` for linking. - # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 + # https://github.com/mruby/mruby/blob/e502fd88b988b0a8d9f31b928eb322eae269c45a/tasks/toolchains/gcc.rake#L30 preBuild = "unset LD"; installPhase = '' @@ -24,19 +26,13 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = '' - runHook preCheck - - rake test - - runHook postCheck - ''; + checkTarget = "test"; meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; maintainers = [ maintainers.nicknovitski ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; }; }