consule: use new bundlerEnv

3 files changed, 2 insertions, 87 deletions

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index 874d662754f9..19715d7b255b 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian, pkgconfig, which }:
+{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian
+, pkgconfig, which }:
 
 bundlerEnv {
   name = "sup-0.20.0";
@@ -8,40 +9,6 @@ bundlerEnv {
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
 
-  fixes.gpgme = attrs: {
-    buildInputs = [ gpgme ];
-  };
-
-  fixes.ncursesw = attrs: {
-    buildInputs = [ ncurses ];
-    buildArgs = [
-      "--with-cflags=-I${ncurses}/include"
-      "--with-ldflags=-L${ncurses}/lib"
-    ];
-  };
-
-  fixes.xapian-ruby = attrs: {
-    # use the system xapian
-    buildInputs = [ xapian pkgconfig zlib ];
-    postPatch = ''
-      cp ${./xapian-Rakefile} Rakefile
-    '';
-    preInstall = ''
-      export XAPIAN_CONFIG=${xapian}/bin/xapian-config
-    '';
-  };
-
-  fixes.sup = attrs: {
-    # prevent sup from trying to dynamically install `xapian-ruby`.
-    postPatch = ''
-      cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
-
-      substituteInPlace lib/sup/crypto.rb \
-        --replace 'which gpg2' \
-                  '${which}/bin/which gpg2'
-    '';
-  };
-
   meta = with lib; {
     description = "A curses threads-with-tags style email client";
     homepage    = http://supmua.org;
diff --git a/pkgs/applications/networking/mailreaders/sup/mkrf_conf_xapian.rb b/pkgs/applications/networking/mailreaders/sup/mkrf_conf_xapian.rb
deleted file mode 100644
index e19f06e23ac2..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/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
diff --git a/pkgs/applications/networking/mailreaders/sup/xapian-Rakefile b/pkgs/applications/networking/mailreaders/sup/xapian-Rakefile
deleted file mode 100644
index 9f0b8e72f08c..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/xapian-Rakefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# encoding: utf-8
-# Install the xapian binaries into the lib folder of the gem
-require 'rbconfig'
-
-c = RbConfig::CONFIG
-
-def system!(cmd)
-  puts cmd
-  system(cmd) or raise
-end
-
-source_dir = 'xapian_source'
-bindings = Dir["#{source_dir}/xapian-bindings-*"].first
-bindings = File.basename(bindings, ".tar.xz")
-
-task :default do
-  system! "tar -xJf #{source_dir}/#{bindings}.tar.xz"
-
-  prefix = Dir.pwd
-  ENV['LDFLAGS'] = "-L#{prefix}/lib"
-
-  system! "mkdir -p lib"
-
-  Dir.chdir bindings do
-    ENV['RUBY'] ||= "#{c['bindir']}/#{c['RUBY_INSTALL_NAME']}"
-    system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
-    system! "make clean all"
-  end
-
-  system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
-  system! "cp #{bindings}/ruby/xapian.rb lib"
-
-  system! "rm lib/*.la"
-  system! "rm lib/*.lai"
-
-  system! "rm -R #{bindings}"
-  system! "rm -R #{source_dir}"
-end