Budget deal allows less money than Trump wanted for wall