-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44840 from nicknovitski/mruby-init
mruby: init at 1.4.1
- Loading branch information
Showing
3 changed files
with
76 additions
and
0 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From f3db284516105fd30b5513a5528104574a7b8545 Mon Sep 17 00:00:00 2001 | ||
From: Samuel Dionne-Riel <samuel@dionne-riel.com> | ||
Date: Thu, 9 Aug 2018 19:07:45 -0400 | ||
Subject: [PATCH] Disables `IO#isatty` test for sandboxed builds. | ||
|
||
--- | ||
mrbgems/mruby-io/test/io.rb | 13 ------------- | ||
1 file changed, 13 deletions(-) | ||
|
||
diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb | ||
index e06b1499..e8a54736 100644 | ||
--- a/mrbgems/mruby-io/test/io.rb | ||
+++ b/mrbgems/mruby-io/test/io.rb | ||
@@ -342,19 +342,6 @@ assert('IO#_read_buf') do | ||
io.closed? | ||
end | ||
|
||
-assert('IO#isatty') do | ||
- skip "isatty is not supported on this platform" if MRubyIOTestUtil.win? | ||
- f1 = File.open("/dev/tty") | ||
- f2 = File.open($mrbtest_io_rfname) | ||
- | ||
- assert_true f1.isatty | ||
- assert_false f2.isatty | ||
- | ||
- f1.close | ||
- f2.close | ||
- true | ||
-end | ||
- | ||
assert('IO#pos=, IO#seek') do | ||
fd = IO.sysopen $mrbtest_io_rfname | ||
io = IO.new fd | ||
-- | ||
2.16.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{ stdenv, ruby, bison, fetchFromGitHub }: | ||
|
||
stdenv.mkDerivation rec { | ||
name = "mruby-${version}"; | ||
version = "1.4.1"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "mruby"; | ||
repo = "mruby"; | ||
rev = version; | ||
sha256 = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww"; | ||
}; | ||
|
||
patches = [ | ||
./0001-Disables-IO-isatty-test-for-sandboxed-builds.patch | ||
]; | ||
|
||
nativeBuildInputs = [ ruby bison ]; | ||
|
||
# Necessary so it uses `gcc` instead of `ld` for linking. | ||
# https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 | ||
preBuild = if stdenv.isLinux then "unset LD" else null; | ||
|
||
installPhase = '' | ||
mkdir $out | ||
cp -R build/host/{bin,lib} $out | ||
''; | ||
|
||
doCheck = true; | ||
|
||
meta = with stdenv.lib; { | ||
description = "An embeddable implementation of the Ruby language"; | ||
homepage = https://mruby.org; | ||
maintainers = [ maintainers.nicknovitski ]; | ||
license = licenses.mit; | ||
platforms = platforms.unix; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters