ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

ruby: fix darwin dependencies

Browse Source
This commit is contained in:
Daiderd Jordan 2018-05-04 19:56:38 +02:00
parent f99ded298f
commit 814938a7ce
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ stdenv, buildPackages, lib { stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , 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, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix, Foundation , buildEnv, bundler, bundix
} @ args: } @ args:
let let
@ -37,7 +37,7 @@ 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, buildPackages, lib { stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true , useRailsExpress ? true
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
@ -48,8 +48,8 @@ let
, libyaml, yamlSupport ? true , libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true , libffi, fiddleSupport ? true
, autoreconfHook, bison, autoconf , autoreconfHook, bison, autoconf
, darwin ? null , buildEnv, bundler, bundix
, buildEnv, bundler, bundix, Foundation , libiconv, libobjc, libunwind, Foundation
}: }:
let rubySrc = let rubySrc =
if useRailsExpress then fetchFromGitHub { if useRailsExpress then fetchFromGitHub {
@ -93,9 +93,8 @@ let
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
# running on darwin # running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline) ++ op (!cursesSupport && stdenv.isDarwin) readline
++ (op (isRuby25 && stdenv.isDarwin) Foundation) ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
enableParallelBuilding = true; enableParallelBuilding = true;

5
pkgs/top-level/all-packages.nix
View File

@ -7355,7 +7355,10 @@ with pkgs;
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) inherit (callPackage ../development/interpreters/ruby {
inherit (darwin) libiconv libobjc libunwind;
inherit (darwin.apple_sdk.frameworks) Foundation;
})
ruby_2_3 ruby_2_3
ruby_2_4 ruby_2_4
ruby_2_5; ruby_2_5;