[build] Fix build on x11 based systems
Merge pull request #21 from faenil/nemomerge_fixes

[build] Fix build on x11 based systems