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

android prebuilt: Fix eval #115118

Merged
merged 2 commits into from Mar 4, 2021
Merged

android prebuilt: Fix eval #115118

merged 2 commits into from Mar 4, 2021

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Also make freetype not target-sensitive.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Ericson2314 and others added 2 commits March 4, 2021 17:38
@Ericson2314
freetype: patch pkg-config in -config better
739381f 
When we have build == host != target, we don't want to patch in a
prefixed pkg-config used for cross compiling. Using `pkgsHostHost`
expressses the intent.

Then again, per NixOS#51176 leaving
`buildPackages.pkg-config` is arguably also correct, if we do further
cross compilation and want to run `freetype-config`. Really, there is no
good solution.
@Ericson2314
android_prebuilt: Fix eval
aee60be
@Ericson2314 Ericson2314 mentioned this pull request Mar 4, 2021
Draft
10 tasks
@Ericson2314 Ericson2314 merged commit 7f76da8 into NixOS:master Mar 4, 2021
@Ericson2314 Ericson2314 deleted the prebuilt-android-fix-eval branch March 4, 2021 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
1 participant
@Ericson2314