Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix texlive on darwin #19800

Merged
merged 2 commits into from
Oct 26, 2016
Merged

Fix texlive on darwin #19800

merged 2 commits into from
Oct 26, 2016

Conversation

mikesperber
Copy link
Contributor

Motivation for this change

texlive-2016 would not build on Darwin.

Things done
  • Unbreak build of clisp on Darwin (on which xindy depends on which texlive depends), which previously was Linux only.
  • Add a dependency to xindy to libiconv.
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@mikesperber, thanks for your PR! By analyzing the history of the files in this pull request, we identified @tohl, @edolstra and @vcunat to be potential reviewers.

@Mic92
Copy link
Member

Mic92 commented Oct 23, 2016

ping @vbgl @matthewbauer @LnL7

@Mic92 Mic92 added 6.topic: darwin Running or building packages on Darwin 8.has: package (update) This PR updates a package to a newer version and removed 8.has: package (update) This PR updates a package to a newer version labels Oct 23, 2016
@copumpkin
Copy link
Member

cc @acowley

]
++ stdenv.lib.optional stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optionals, please, to avoid nested lists.

Clisp depended on libffcall, which does not compile on Darwin.  The
dependency is optional though, so omit it on Darwin.  Also, make
conditional transitive dependencies on libffcall.
... as the build process invokes iconv.
@mikesperber
Copy link
Contributor Author

Thanks for the review! Done.

@vcunat vcunat merged commit 0fba729 into NixOS:master Oct 26, 2016
@vcunat
Copy link
Member

vcunat commented Nov 1, 2016

It's not perfect, apparently: #20062

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants