public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ruby: Enable cross-compilation

Browse Source
This commit is contained in:
Ben Gamari 2017-10-29 15:51:16 -04:00 committed by Will Dietz
parent 2d772d52ae
commit 41026550e2
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/interpreters/ruby/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub { stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, darwin ? null , autoconf, darwin ? null
, buildEnv, bundler, bundix, Foundation , buildEnv, bundler, bundix, Foundation
@ -22,6 +23,12 @@ let
# Contains the ruby version heuristics # Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; }; rubyVersion = import ./ruby-version.nix { inherit lib; };
# Needed during postInstall
buildRuby =
if stdenv.hostPlatform == stdenv.buildPlatform
then "$out/bin/ruby"
else "${buildPackages.ruby}/bin/ruby";
generic = { version, sha256 }: let generic = { version, sha256 }: let
ver = version; ver = version;
tag = ver.gitTag; tag = ver.gitTag;
@ -30,7 +37,8 @@ let
isRuby25 = ver.majMin == "2.5"; isRuby25 = ver.majMin == "2.5";
baseruby = self.override { useRailsExpress = false; }; baseruby = self.override { useRailsExpress = false; };
self = lib.makeOverridable ( self = lib.makeOverridable (
{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub { stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true , useRailsExpress ? true
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
@ -67,7 +75,11 @@ let
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff"; NROFF = "${groff}/bin/nroff";
nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ]; nativeBuildInputs =
ops useRailsExpress [ autoreconfHook bison ]
++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [
buildPackages.ruby
];
buildInputs = buildInputs =
(op fiddleSupport libffi) (op fiddleSupport libffi)
++ (ops cursesSupport [ ncurses readline ]) ++ (ops cursesSupport [ ncurses readline ])
@ -129,14 +141,16 @@ let
"--with-out-ext=tk" "--with-out-ext=tk"
# on yosemite, "generating encdb.h" will hang for a very long time without this flag # on yosemite, "generating encdb.h" will hang for a very long time without this flag
"--with-setjmp-type=setjmp" "--with-setjmp-type=setjmp"
]; ]
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";
installFlags = stdenv.lib.optionalString docSupport "install-doc"; installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory # Bundler tries to create this directory
postInstall = '' postInstall = ''
# Update rubygems # Update rubygems
pushd rubygems pushd rubygems
$out/bin/ruby setup.rb ${buildRuby} setup.rb
popd popd
# Remove unnecessary groff reference from runtime closure, since it's big # Remove unnecessary groff reference from runtime closure, since it's big