diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-11-27 21:58:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-27 21:58:17 -0500 |
| commit | 5cc4f50442d956506b0cbbb487575aa2352984e4 (patch) | |
| tree | 3f8898b7a9ee6fd8442134eabf3466bae54d7a7c /pkgs/development/ruby-modules | |
| parent | f38955dd4c80c3e7ca6f33e3ef2150212a2ef447 (diff) | |
| parent | 4f01beb5312096c2eab6f09b771513306ecb381c (diff) | |
| download | nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.tar nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.tar.gz nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.tar.bz2 nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.tar.lz nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.tar.xz nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.tar.zst nixlib-5cc4f50442d956506b0cbbb487575aa2352984e4.zip | |
Merge pull request #20113 from johbo/ruby-scrypt-darwin
Adjust ruby gem defaults for scrypt on darwin
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index acd04ee3bf5a..26925de8db42 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -156,6 +156,14 @@ in buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; }; + scrypt = attrs: + if stdenv.isDarwin then { + dontBuild = false; + postPatch = '' + sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile + ''; + } else {}; + snappy = attrs: { buildInputs = [ args.snappy ]; }; @@ -220,4 +228,3 @@ in }; } - |