From c0172418aba3f740e7972197900ccb5d36f88f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 5 Apr 2012 17:32:02 +0000 Subject: [PATCH] hurdPartedCross: Make overridable. svn path=/nixpkgs/trunk/; revision=33630 --- 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 2844d47a501..4cafd94eb33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1164,17 +1164,20 @@ let hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" - then (parted.override { - # Needs the Hurd's libstore. - hurd = gnu.hurdCrossIntermediate; + then (makeOverridable + ({ hurd }: + (parted.override { + # Needs the Hurd's libstore. + inherit hurd; - # 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) + { hurd = gnu.hurdCrossIntermediate; }) else null; patch = gnupatch;