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: 22a802584f1a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a815f53c60b9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 12, 2018

  1. libredirect: Add preload wrapper for stat() 

    Pull request #50246 was merged a bit too quickly and it was supposed to
fix libredirect on Darwin. However it still failed on Darwin and this
was missed by the person merging the pull request.

The reason this was failing was that there is no __xstat* on Darwin.

So I'm adding a wrapper for stat() as well as it works on Darwin and it
still doesn't hurt on GNU/Linux.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @zimbatm
    @aszlig
    aszlig committed Nov 12, 2018
    4

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a815f53 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/build-support/libredirect/libredirect.c
7 changes: 7 additions & 0 deletions pkgs/build-support/libredirect/libredirect.c
View file
Original file line number Diff line number Diff line change
@@ -119,6 +119,13 @@ int __xstat64(int ver, const char * path, struct stat64 * st)
return __xstat64_real(ver, rewrite(path, buf), st);
}

int stat(const char * path, struct stat * st)
{
int (*__stat_real) (const char *, struct stat *) = dlsym(RTLD_NEXT, "stat");
char buf[PATH_MAX];
return __stat_real(rewrite(path, buf), st);
}

int * access(const char * path, int mode)
{
int * (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access");