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
base: 7cedee3c7924
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f7d5b76e03f4
Choose a head ref
  • 6 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 11, 2018

  1. libredirect: Add support for Darwin

    The library can be used also on Darwin using it like this:
    
      NIX_REDIRECTS='foo=bar' \
      DYLD_INSERT_LIBRARIES=${libredirect}/lib/libredirect.so \
      DYLD_FORCE_FLAT_NAMESPACE=1 \
      some_program
    
    So let's actually not hardcade gcc and add Darwin to meta.platforms.
    
    No other changes seem to be required.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Nov 11, 2018
    Copy the full SHA
    753743c View commit details
    Browse the repository at this point in the history
  2. use for cross-compilation

    zimbatm committed Nov 11, 2018
    Copy the full SHA
    d76ec52 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    9ef5235 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2018

  1. libredirect: Use extensions.sharedLibrary

    This is to make sure we get the correct shared library suffix of the
    target platform. While for example on Darwin it would even work with the
    hardcoded .so prefix it's IMHO a bit nicer to have the actual native
    extension.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Nov 12, 2018
    Copy the full SHA
    ba1fddb View commit details
    Browse the repository at this point in the history
  2. libredirect: Add a small test

    This is just a sanity check on whether the library correctly wraps the
    syscalls and it's using the "true" executable for posix_spawn() and
    execv().
    
    The installCheckPhase is not executed if we are cross-compiling, so this
    shouldn't break cross-compilation.
    
    One thing I'm not actually sure is whether ${coreutils}/bin/true is
    universally available on all the platforms, nor whether all the
    functions we use in the test are available, but we can still fix that
    after we've found out about that.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Nov 12, 2018
    Copy the full SHA
    34dd1c6 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #50246 from aszlig/libredirect-darwin

    libredirect: Add support for Darwin
    edolstra committed Nov 12, 2018
    Copy the full SHA
    f7d5b76 View commit details
    Browse the repository at this point in the history