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.

Sign up for GitHub

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

Jump to bottom

androidndk: Fixes missing libraries for prebuilt clang #41020

Merged
merged 1 commit into from Jun 2, 2018
Merged

androidndk: Fixes missing libraries for prebuilt clang #41020

merged 1 commit into from Jun 2, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented May 24, 2018 •
edited

Motivation for this change

@Ericson2314

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • 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.

dtzWill
dtzWill reviewed May 24, 2018
View reviewed changes
pkgs/development/mobile/androidenv/androidndk.nix Outdated
@@ -33,9 +33,14 @@ stdenv.mkDerivation rec {
in ''
set -x
mkdir -pv $out/libexec
mkdir -pv $out/lib64
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib64/libtinfo.so.5
ln -s ${ncurses.out}/lib/libncurses.so.6 $out/lib64/libncurses.so.5
Copy link
Member

Choose a reason for hiding this comment

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

Erm this doesn't seem like a good idea. Grab these from ncurses5 instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh, did not know that! I found that in other packages, maybe we should fix them too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@matthewbauer
Copy link
Member

@GrahamcOfBorg build androidenv.androidndk

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: androidenv.androidndk

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: androidenv.androidndk

Partial log (click to expand)

++ local hookName=exitHook
++ case "$(type -t "$hookName")" in
+++ type -t exitHook
++ '[' -z '' ']'
++ return 0
+ set -u
+ eval 'set +o nounset'
++ set +o nounset
+ return 0
+ exit 0

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: androidenv.androidndk

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@matthewbauer matthewbauer merged commit 1fc2853 into NixOS:master Jun 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill dtzWill left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bkchr @matthewbauer @GrahamcOfBorg @dtzWill