Changes required to build under Nix package system