From 2ad6c9c6c215d48bd1524e8f281ede8bfea1e2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:35:10 +0000
Subject: [PATCH] Parted (cross-GNU): Only refer to `.hostDrv' when
 cross-building.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25090
---
 pkgs/top-level/all-packages.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74550f2ce157..da0b5a67a21f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1014,17 +1014,20 @@ let
 
   parted = callPackage ../tools/misc/parted { };
 
-  hurdPartedCross = (callPackage ../tools/misc/parted {
-    # Needs the Hurd's libstore.
-    hurd = hurdCrossIntermediate;
+  hurdPartedCross =
+    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+    then (callPackage ../tools/misc/parted {
+        # Needs the Hurd's libstore.
+        hurd = hurdCrossIntermediate;
 
-    # The Hurd wants a libparted.a.
-    enableStatic = true;
+        # The Hurd wants a libparted.a.
+        enableStatic = true;
 
-    gettext = null;
-    readline = null;
-    devicemapper = null;
-  }).hostDrv;
+        gettext = null;
+        readline = null;
+        devicemapper = null;
+      }).hostDrv
+    else null;
 
   patch = gnupatch;