Fix building against current Nix master
Support -I flag