Also fix some references, and drop unused makeFlags: https://github.com/NixOS/nixpkgs/commit/3300479c#commitcomment-10790021