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

edit: Init at 20160425 #16707

Merged
merged 1 commit into from
Jul 4, 2016
Merged

edit: Init at 20160425 #16707

merged 1 commit into from
Jul 4, 2016

Conversation

vrthra
Copy link
Member

@vrthra vrthra commented Jul 4, 2016

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useChroot on NixOS,
    or option build-use-chroot 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.

@@ -0,0 +1,38 @@
{ stdenv, fetchgit, unzip, pkgconfig, ncurses, x11, cwebbin }:
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder, is x11 supposed to be libX11?

Copy link
Member Author

Choose a reason for hiding this comment

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

@joachifm updated. However, I have a question. Why does x11 work? I cant see that package in the top-level/all-packages.nix?

Copy link
Contributor

@joachifm joachifm Jul 4, 2016

Choose a reason for hiding this comment

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

It works because x11 is defined as an alias for xlibsWrapper; libX11 won't work here, actually (EDIT: it needs some additional x11 libs).

Copy link
Member Author

Choose a reason for hiding this comment

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

So should I change it to xlibsWrapper or is the current (libx11 + libxft) OK? it seems to be passing in hydra

Copy link
Contributor

Choose a reason for hiding this comment

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

I suppose more specific is better. In the end, you'll only end up bloating the build environment, so it's not that big of a deal (unless there are optional features you want to disable by omitting their dependencies from the environment).

@joachifm joachifm merged commit b51cf26 into NixOS:master Jul 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants