Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 769e14a42280
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bde09a92c16d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 14, 2017

  1. xapian: fixup darwin 

    The configure script is detecting that __exp10 is available even
though it isn’t on latest versions. This is the best fix I can find
for now.
    @matthewbauer
    matthewbauer committed May 14, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    matthewbauer Matthew Bauer
    GPG key ID: E04D0AD9469141C3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f33ca4e View commit details

Commits on May 19, 2017

  1. Merge pull request #25774 from matthewbauer/xapian-fixup 

    xapian: fixup darwin
    @Mic92
    Mic92 authored May 19, 2017
    Copy the full SHA
    bde09a9 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/development/libraries/xapian/default.nix
7 changes: 7 additions & 0 deletions pkgs/development/libraries/xapian/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,13 @@ let

doCheck = true;

# the configure script thinks that Darwin has ___exp10
# but it’s not available on my systems (or hydra apparently)
postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace config.h \
--replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10"
'';

meta = with stdenv.lib; {
description = "Search engine library";
homepage = http://xapian.org/;