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

Merge pull request #13109 from zimbatm/ruby-fixes

Browse Source 
Ruby fixes
This commit is contained in:
Charles Strahan 2016-02-20 20:29:25 -05:00
commit 123a9104e4
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
View File

@ -50,24 +50,24 @@ lib.makeOverridable (
, passthru ? {} , passthru ? {}
, ...} @ attrs: , ...} @ attrs:
if ! builtins.elem type [ "git" "gem" ]
then throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
else
let let
shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
rubygems = (attrs.rubygems or defs.rubygems).override { rubygems = (attrs.rubygems or defs.rubygems).override {
inherit ruby; inherit ruby;
}; };
src = attrs.src or ( src = attrs.src or (
if type == "gem" if type == "gem" then
then fetchurl { fetchurl {
urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes; urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes;
inherit (attrs) sha256; inherit (attrs) sha256;
} else fetchgit { }
inherit (attrs) url rev sha256 fetchSubmodules; else if type == "git" then
leaveDotGit = true; fetchgit {
} inherit (attrs) url rev sha256 fetchSubmodules;
leaveDotGit = true;
}
else
throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
); );
documentFlag = documentFlag =
if document == [] if document == []

9
pkgs/development/interpreters/ruby/gemconfig/default.nix
View File

@ -21,6 +21,7 @@
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
, libmsgpack
}: }:
let let
@ -40,6 +41,10 @@ in
''; '';
}; };
eventmachine = attrs: {
buildInputs = [ openssl ];
};
ffi = attrs: { ffi = attrs: {
buildInputs = [ libffi pkgconfig ]; buildInputs = [ libffi pkgconfig ];
}; };
@ -56,6 +61,10 @@ in
buildFlags = [ "--with-system-v8=true" ]; buildFlags = [ "--with-system-v8=true" ];
}; };
msgpack = attrs: {
buildInputs = [ libmsgpack ];
};
mysql2 = attrs: { mysql2 = attrs: {
buildInputs = [ mysql.lib zlib openssl ]; buildInputs = [ mysql.lib zlib openssl ];
}; };