Skip to content

libdrm: fix build for FreeBSD#214790

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
alyssais:libdrm-freebsd
Feb 5, 2023
Merged

libdrm: fix build for FreeBSD#214790
Ericson2314 merged 1 commit intoNixOS:stagingfrom
alyssais:libdrm-freebsd

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Feb 5, 2023

Description of changes

I've changed etnaviv from being explicitly enabled on ARM to using its auto value, as it is now enabled by default on appropriate architectures (including ARM).

Make omap and etnaviv Linux-only as they both include Linux headers. They're disabled in FreeBSD Ports too.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

I've changed etnaviv from being explicitly enabled on ARM to using
its auto value, as it is now enabled by default on appropriate
architectures (including ARM).

Make omap and etnaviv Linux-only as they both include Linux headers.
They're disabled in FreeBSD Ports too.
@alyssais alyssais added the 6.topic: bsd Running or building packages on BSD label Feb 5, 2023
@alyssais alyssais requested a review from Ericson2314 February 5, 2023 17:09
@ofborg ofborg bot requested a review from primeos February 5, 2023 18:10
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 5, 2023
@Ericson2314 Ericson2314 merged commit c00251e into NixOS:staging Feb 5, 2023
@alyssais alyssais deleted the libdrm-freebsd branch February 5, 2023 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: bsd Running or building packages on BSD 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants