diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/compilers/mruby | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/mruby')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/mruby/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/compilers/mruby/default.nix b/nixpkgs/pkgs/development/compilers/mruby/default.nix index 6cebeed7378e..578dbf9c9837 100644 --- a/nixpkgs/pkgs/development/compilers/mruby/default.nix +++ b/nixpkgs/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 ]; + maintainers = with maintainers; [ nicknovitski marsam ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; }; } |