Author: ludo
Date: Thu Apr 5 17:32:02 2012
New Revision: 33630
URL: https://nixos.org/websvn/nix/?rev=33630&sc=1
Log:
hurdPartedCross: Make overridable.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 5 16:51:59
2012 (r33629)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 5 17:32:02
2012 (r33630)
@@ -1164,17 +1164,20 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
