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: b44d5136e8a8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 564653f91d70
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 15, 2019

  1. ocamlPackages.zarith: use buildOcaml instead of mkDerivation 

    This has two main advantages:

  - By setting hasSharedObjects = true, buildOcaml will automatically
include a setup-hook.sh that sets CAML_LD_LIBRARY_PATH in dependent
expressions. This is needed to pick up dllzarith.so properly which is
shipped as part of the library.

  - We can kill the ugly assert in the expression and instead change it
to use minimumSupportedOcamlVersion.

(Note: this was reverted in b44d513, but the change is
exactly equivalent -- I wasn't sure what impact zarith might actually
have without checking OfBorg, which I wanted to do first.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Jan 15, 2019
    Copy the full SHA
    564653f View commit details
    Browse the repository at this point in the history