diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index eeb480e6847..7187f9b575f 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -1,15 +1,18 @@ { stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib -, python ? null, php ? null, ruby ? null }: +, python ? null, sphinx ? null, php ? null, ruby ? null }: + +assert (python != null) -> (sphinx != null); let inherit (composableDerivation) wwf; in composableDerivation.composableDerivation {} rec { - name = "xapian-bindings-1.2.23"; + name = "xapian-bindings-${version}"; + version = (builtins.parseDrvName xapian.name).version; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz"; - sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r"; + url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz"; + sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s"; }; buildInputs = [ xapian pkgconfig zlib ]; @@ -19,7 +22,18 @@ composableDerivation.composableDerivation {} rec { wwf { name = "python"; enable = { - buildInputs = [ python ]; + buildInputs = [ python sphinx ]; + + # Our `sphinx-build` binary is a shell wrapper around + # `sphinx-build` python code. Makefile tries to execute it + # using python2 and fails. Fixing that here. + patchPhase = '' + for a in python/Makefile* ; do + substituteInPlace $a \ + --replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)' + done + ''; + # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix similarity index 91% rename from pkgs/tools/misc/xapian-omega/default.nix rename to pkgs/development/libraries/xapian/tools/omega/default.nix index c3798878f1b..7c64c2e90d4 100644 --- a/pkgs/tools/misc/xapian-omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "xapian-omega-${version}"; - version = "1.4.0"; + version = (builtins.parseDrvName xapian.name).version; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdd24c2e858..37a57a5b4f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9806,9 +9806,10 @@ in xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python php = php56; + sphinx = pythonPackages.sphinx; }; - xapian-omega = callPackage ../tools/misc/xapian-omega { + xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; };