Fix merge issue

Author: hamishmack

overlays/default-setup.nix

@@ -29,7 +29,7 @@ let
         # in the native case, it would be the same in the cross case however
         # we *really* want to build the Setup.hs on the build machine and not
         # have the stdenv confuse it with the target/host env.
-        inherit (final.buildPackages) stdenv pkgconfig;
+        inherit (final.buildPackages) stdenv;
         inherit (final) buildPackages;
         inherit haskellLib nonReinstallablePkgs makeSetupConfigFiles;
       };