From fa0a12e35dc947c34a12fa663e446792d824ba44 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 14 Jan 2017 16:39:03 -0500 Subject: [PATCH 1/2] release-cross: Use `nativeDrv` rather than relying on default The default will soon change --- pkgs/top-level/release-cross.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index a2f5903e55d..ec013816145 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; From 27b47ef7360f6dee2fec603f22854bff023a2d57 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 14 Jan 2017 17:52:54 -0500 Subject: [PATCH 2/2] gawk: xz.bin should be a native build input --- pkgs/tools/text/gawk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index c7e0857c2ca..271a89b784d 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;