Skip to content

freerdp: fix cross#225342

Merged
lheckemann merged 2 commits intomasterfrom
unknown repository
Apr 10, 2023
Merged

freerdp: fix cross#225342
lheckemann merged 2 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 8, 2023

  • freerdp: disable man pages if cross compiling
  • freerdp: add wayland-scanner to nativeBuildInputs

Adam Joseph added 2 commits April 8, 2023 14:01
We must also pass `-DWAYLAND_SCANNER=` explicitly, because freerdp
attempts to use the `hostPlatform`'s wayland-scanner (which it
presumably is locating via the `wayland` in `buildInputs`)
The manpage generator attempts to execute `hostPlatform` binaries.
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 8, 2023
@ofborg ofborg bot requested review from lheckemann and peterhoeg April 8, 2023 22:00
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 8, 2023
@lheckemann lheckemann merged commit 1243de2 into NixOS:master Apr 10, 2023
@ghost ghost deleted the pr/fixcross/freerdp branch April 11, 2023 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant