sup: use bundlerApp, cleanup (#60515)

2019-04-30 20:13:17 +02:00
parent bc757ff4f2
commit 98e0f54b85
6 changed files with 194 additions and 160 deletions
@@ -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