diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 598fee2bfcba..9aba2ffb0292 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -125,9 +125,7 @@ with pkgs;
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.
-    dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs) // {
-      __attrsFailEvaluation = true;
-    };
+    dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs);
 
   ### Nixpkgs maintainer tools
 
diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json
index 5705c8ad4c70..83885cd85cb5 100644
--- a/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -395,7 +395,7 @@
     },
     "javascriptcoregtk-4.0": {
       "attrPath": [
-        "webkitgtk"
+        "webkitgtk_4_0"
       ]
     },
     "lapack": {
@@ -837,12 +837,12 @@
     },
     "webkit2gtk-4.0": {
       "attrPath": [
-        "webkitgtk"
+        "webkitgtk_4_0"
       ]
     },
     "webkit2gtk-web-extension-4.0": {
       "attrPath": [
-        "webkitgtk"
+        "webkitgtk_4_0"
       ]
     },
     "x11": {