summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/gem-config/default.nix
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-03-06 20:23:02 +0100
committerJörg Thalheim <joerg@thalheim.io>2017-03-06 20:24:07 +0100
commitb10fb4624b4d31a495aca99008f26777fb8501ad (patch)
treea39c4867a012ab7d13a900a97f70351f649d2d7a /pkgs/development/ruby-modules/gem-config/default.nix
parent8cbba14dbe34dd2d7f838e4322976c8350f02b6f (diff)
downloadnixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.tar
nixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.tar.gz
nixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.tar.bz2
nixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.tar.lz
nixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.tar.xz
nixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.tar.zst
nixpkgs-b10fb4624b4d31a495aca99008f26777fb8501ad.zip
xapian-ruby: link against correct xapian
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config/default.nix')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 20dc23979f5..02fe9f50558 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,7 +19,7 @@
 
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
 , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc
 }@args:
@@ -89,7 +89,7 @@ in
   msgpack = attrs: {
     buildInputs = [ libmsgpack ];
   };
-  
+
   mysql = attrs: {
     buildInputs = [ mysql.lib zlib openssl ];
   };
@@ -218,7 +218,7 @@ in
         --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
     '';
   };
-  
+
   uuid4r = attrs: {
     buildInputs = [ which libossp_uuid ];
   };
@@ -226,12 +226,12 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    buildInputs = [ xapian pkgconfig zlib ];
+    buildInputs = [ xapian_1_2_22 pkgconfig zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
     '';
     preInstall = ''
-      export XAPIAN_CONFIG=${xapian}/bin/xapian-config
+      export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config
     '';
   };