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

Commits on Jun 11, 2019

  1. plan9port: build everything on Darwin 

    A commit in 2014 (see #2266) disabled building parts which depended on
X11 on Mac OS.  There's no explanation given in the pull request.  In
any case, many people install plan9port on Darwin specifically to use
the UI components.

Aside from this, the derivation was broken on Mac OS, probably because
people put the `which` and `perl` dependencies inside the !isDarwin
conditional.  Some programs worked, however the static libraries did
not build, so this could not be used as a buildInput to build programs
which need the libraries.  This fixes that.
    @eraserhd
    eraserhd committed Jun 11, 2019
    Copy the full SHA
    26aef37 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62992 from eraserhd/plan9port-enable-darwin-x11 

    plan9port: build everything on Darwin
    @matthewbauer
    matthewbauer committed Jun 11, 2019
    Copy the full SHA
    21edffe View commit details
    Browse the repository at this point in the history