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: cb7c04f53cff
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d4b04199565e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 10, 2018

  1. openbsm: fix linux build 

    See https://hydra.nixos.org/build/80705916

To fix the linux build the patch `bsm-add-audit_token_to_pid.patch`
mustn't be applied during Linux builds, only for Darwin as it's an
Apple-only fix.

The compiler failure occurred because `audit_token_t` is part of
`<mach/mach.h>` which is not available on Linux.

Addresses #45960
    @Ma27
    Ma27 committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    080b2fd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #46475 from Ma27/fix-openbsm 

    openbsm: fix linux build
    @timokau
    timokau committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    d4b0419 View commit details
    Browse the repository at this point in the history