Skip to content

fix hermeticity - #3104

Open
hustlerone wants to merge 1 commit into
WayfireWM:masterfrom
hustlerone:master
Open

fix hermeticity#3104
hustlerone wants to merge 1 commit into
WayfireWM:masterfrom
hustlerone:master

Conversation

@hustlerone

Copy link
Copy Markdown
Contributor

can't build in nix without patching this in


// TODO: do we need some kind of dependency here?
#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems wrong, on my system, pkg-config --cflags libdrm gives -I/usr/include/libdrm where drm_fourcc.h is located. wlroots also includes the header with just drm_fourcc.h so I think that after adding the drm dep, you shouldn't need this.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I think adding drm to the meson.build is the only change that should be necessary.
Even in nixpkgs pkg-config correctly returns .../libdrm as an include dir:

$ pkg-config --cflags libdrm 
-I/nix/store/jl06f30bsw7ya4qvlpawjqx23x52hm62-libdrm-2.4.133-dev/include -I/nix/store/jl06f30bsw7ya4qvlpawjqx23x52hm62-libdrm-2.4.133-dev/include/libdrm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants