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

Jump to bottom

mesa wayland: Fix/simplify cross #89036

Merged
merged 3 commits into from May 27, 2020
Merged

mesa wayland: Fix/simplify cross #89036

merged 3 commits into from May 27, 2020

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Fix #88961

CC @nagisa

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
mkDerivation: Don't need to specify pkg-config for meson any more
162c0c3 
Env var will work fine.
@Ericson2314
wayland: Simplify cross build
f005272 
Now that we have a pkg-config wrapper, we can get build-time deps via
pkg-config.
@ofborg ofborg bot added the 6.topic: stdenv Standard environment label May 27, 2020
@nagisa
Copy link
Contributor

nagisa commented May 27, 2020

LGTM, will try it out in a sec.

@Ericson2314 Ericson2314 mentioned this pull request May 27, 2020
Closed
@ofborg ofborg bot requested review from primeos, vcunat and codyopel May 27, 2020 18:15
matthewbauer
matthewbauer reviewed May 27, 2020
View reviewed changes
pkgs/development/libraries/mesa/default.nix
@@ -73,6 +73,12 @@ stdenv.mkDerivation {
})
];

postPatch = ''
substituteInPlace meson.build --replace \
Copy link
Member

Choose a reason for hiding this comment

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

doesn't meson know of two pkg-config versions?

Copy link
Member Author

Choose a reason for hiding this comment

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

Meson itself does, but for some reason this is using a generic find-program that doesn't know about the program it's looking for.

@nagisa
Copy link
Contributor

nagisa commented May 27, 2020

Can confirm that this has the intended effect and mesa now does in fact properly cross-compile.

@Ericson2314 Ericson2314 merged commit cc1af07 into NixOS:staging May 27, 2020
@Ericson2314 Ericson2314 deleted the fix-mesa-wayland-cross branch May 27, 2020 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

@primeos primeos Awaiting requested review from primeos

@vcunat vcunat Awaiting requested review from vcunat

@codyopel codyopel Awaiting requested review from codyopel

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ericson2314 @nagisa @matthewbauer