From f4edebfa129d6f762ebd3c16da7eaecd9fe9e655 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 3 Jan 2015 18:27:41 +0100
Subject: [PATCH] gettext: Check for existence of stdenv.ccCross.
Should only affect cross-builds, however I didn't test whether
cross-building gettext actually works. But if it's broken now, it was
broken before as well and this at least unbreaks the non-cross-built
nixpkgs tarball job :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
pkgs/development/libraries/gettext/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 8d88ef45303..091d780c722 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
enableParallelBuilding = true;
crossAttrs = {
- buildInputs = stdenv.lib.optional (stdenv.ccCross.libc ? libiconv)
+ buildInputs = stdenv.lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv)
stdenv.ccCross.libc.libiconv.crossDrv;
# Gettext fails to guess the cross compiler
configureFlags = "CXX=${stdenv.cross.config}-g++";