Build fixes for Nix
There have been multiple attempts to package GNOME Builder for the Nix package manager and NixOS (mine and an earlier attempt). Some of the difficulties seem easy to resolve upstream, and potentially useful to others, so I'm hoping the two patches in this merge request can go in for 3.30.