From 594b2147963248f82b93b7ac08491f70f6bcfae3 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 27 Feb 2021 13:10:30 +0100 Subject: [PATCH] poke: cross-compilation support --- pkgs/applications/editors/poke/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 7b56fc03bdc..1c6f005863b 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -15,7 +15,9 @@ , dejagnu }: -stdenv.mkDerivation rec { +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in stdenv.mkDerivation rec { pname = "poke"; version = "1.0"; @@ -37,11 +39,12 @@ stdenv.mkDerivation rec { texinfo ] ++ lib.optional guiSupport makeWrapper; - buildInputs = [ boehmgc dejagnu readline ] + buildInputs = [ boehmgc readline ] ++ lib.optional guiSupport tk ++ lib.optional miSupport json_c ++ lib.optional nbdSupport libnbd - ++ lib.optional textStylingSupport gettext; + ++ lib.optional textStylingSupport gettext + ++ lib.optional (!isCross) dejagnu; configureFlags = lib.optionals guiSupport [ "--with-tcl=${tcl}/lib" @@ -51,8 +54,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; - checkInputs = [ dejagnu ]; + doCheck = !isCross; + checkInputs = lib.optionals (!isCross) [ dejagnu ]; postFixup = lib.optionalString guiSupport '' wrapProgram "$out/bin/poke-gui" \