diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index c7e0857c2ca4..271a89b784d9 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
     || stdenv.isFreeBSD
   );
 
-  buildInputs = [ xz.bin ]
-    ++ stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
+  nativeBuildInputs = [ xz.bin ];
+  buildInputs =
+       stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
     ++ stdenv.lib.optional interactive readline
     ++ stdenv.lib.optional stdenv.isDarwin locale;
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index a2f5903e55d2..ec013816145c 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -24,7 +24,7 @@ let
   /* Basic list of packages to be natively built,
      but need a crossSystem defined to get meaning */
   basicNativeDrv = {
-    gdbCross = nativePlatforms;
+    gdbCross.nativeDrv = nativePlatforms;
   };
 
   basic = basicCrossDrv // basicNativeDrv;