sup: use bundlerApp, cleanup (#60515)

2 files changed, 12 insertions, 16 deletions

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 53506ffe8da8..cb7a2f19b5e3 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -415,6 +415,7 @@ in
   sup = attrs: {
     dontBuild = false;
     # prevent sup from trying to dynamically install `xapian-ruby`.
+    nativeBuildInputs = [ rake ];
     postPatch = ''
       cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
 
@@ -484,7 +485,7 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ rake pkgconfig ];
     buildInputs = [ xapian_1_2_22 zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
diff --git a/pkgs/development/ruby-modules/gem-config/xapian-Rakefile b/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
index 9f0b8e72f08c..54412ff810b0 100644
--- a/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
+++ b/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
@@ -4,35 +4,30 @@ 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"
+  sh "tar -xJf #{source_dir}/#{bindings}.tar.xz"
 
   prefix = Dir.pwd
   ENV['LDFLAGS'] = "-L#{prefix}/lib"
 
-  system! "mkdir -p lib"
+  sh "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"
+    sh "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
+    sh "make clean all"
   end
 
-  system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
-  system! "cp #{bindings}/ruby/xapian.rb lib"
+  sh "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
+  sh "cp #{bindings}/ruby/xapian.rb lib"
 
-  system! "rm lib/*.la"
-  system! "rm lib/*.lai"
+  sh "rm lib/*.la"
+  sh "rm lib/*.lai"
 
-  system! "rm -R #{bindings}"
-  system! "rm -R #{source_dir}"
+  sh "rm -R #{bindings}"
+  sh "rm -R #{source_dir}"
 end