diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-12 22:49:43 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-12 22:49:43 +0200 |
| commit | a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc (patch) | |
| tree | c8dee9fa804b516d2447f816359e8f15b3d85110 /pkgs/development/ruby-modules | |
| parent | 20c7a35429c4882227f1fb9788aeebc7c12726bf (diff) | |
| parent | 7d39ecdf58cc000013e4bf05d9c2f32ab4bf93a7 (diff) | |
| download | nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.tar nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.tar.gz nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.tar.bz2 nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.tar.lz nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.tar.xz nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.tar.zst nixpkgs-a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb | 14 |
2 files changed, 1 insertions, 27 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 06dabcdfcf9..9a02f4f374a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -198,6 +198,7 @@ in gpgme = attrs: { buildInputs = [ gpgme ]; + buildFlags = [ "--use-system-libraries" ]; }; gio2 = attrs: { @@ -535,19 +536,6 @@ in ]; }; - sup = attrs: { - dontBuild = false; - # prevent sup from trying to dynamically install `xapian-ruby`. - nativeBuildInputs = [ bundler rake ]; - postPatch = '' - cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb - - substituteInPlace lib/sup/crypto.rb \ - --replace 'which gpg2' \ - '${which}/bin/which gpg' - ''; - }; - rb-readline = attrs: { dontBuild = false; postPatch = '' diff --git a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb b/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb deleted file mode 100644 index e19f06e23ac..00000000000 --- a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'rubygems' -require 'rubygems/command.rb' -require 'rubygems/dependency_installer.rb' -require 'rbconfig' - -begin - Gem::Command.build_args = ARGV -rescue NoMethodError -end - -# create dummy rakefile to indicate success -f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") -f.write("task :default\n") -f.close |