ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

xapian-ruby: link against correct xapian

Browse Source
This commit is contained in:
Jörg Thalheim 2017-03-06 20:23:02 +01:00
parent 8cbba14dbe
commit b10fb4624b
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/libraries/xapian/default.nix
View File

@ -1,23 +1,28 @@
{ stdenv, fetchurl, libuuid, zlib }: { stdenv, fetchurl, libuuid, zlib }:
stdenv.mkDerivation rec { let
name = "xapian-${version}"; generic = version: sha256: stdenv.mkDerivation rec {
version = "1.4.0"; name = "xapian-${version}";
src = fetchurl { src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h"; inherit sha256;
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
buildInputs = [ libuuid zlib ]; buildInputs = [ libuuid zlib ];
meta = { meta = {
description = "Search engine library"; description = "Search engine library";
homepage = http://xapian.org/; homepage = http://xapian.org/;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.chaoflow ]; maintainers = [ stdenv.lib.maintainers.chaoflow ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
};
}; };
in {
# used by xapian-ruby
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
} }

10
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -19,7 +19,7 @@
{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , 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 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc
}@args: }@args:
@ -89,7 +89,7 @@ in
msgpack = attrs: { msgpack = attrs: {
buildInputs = [ libmsgpack ]; buildInputs = [ libmsgpack ];
}; };
mysql = attrs: { mysql = attrs: {
buildInputs = [ mysql.lib zlib openssl ]; buildInputs = [ mysql.lib zlib openssl ];
}; };
@ -218,7 +218,7 @@ in
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
''; '';
}; };
uuid4r = attrs: { uuid4r = attrs: {
buildInputs = [ which libossp_uuid ]; buildInputs = [ which libossp_uuid ];
}; };
@ -226,12 +226,12 @@ in
xapian-ruby = attrs: { xapian-ruby = attrs: {
# use the system xapian # use the system xapian
dontBuild = false; dontBuild = false;
buildInputs = [ xapian pkgconfig zlib ]; buildInputs = [ xapian_1_2_22 pkgconfig zlib ];
postPatch = '' postPatch = ''
cp ${./xapian-Rakefile} Rakefile cp ${./xapian-Rakefile} Rakefile
''; '';
preInstall = '' preInstall = ''
export XAPIAN_CONFIG=${xapian}/bin/xapian-config export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config
''; '';
}; };

4
pkgs/top-level/all-packages.nix
View File

@ -10044,7 +10044,9 @@ with pkgs;
x265 = callPackage ../development/libraries/x265 { }; x265 = callPackage ../development/libraries/x265 { };
xapian = callPackage ../development/libraries/xapian { }; inherit (callPackage ../development/libraries/xapian { })
xapian_1_2_22 xapian_1_4_0;
xapian = xapian_1_4_0;
xapian-omega = callPackage ../development/libraries/xapian/tools/omega { xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
libmagic = file; libmagic = file;