swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Parted (cross-GNU): Only refer to `.hostDrv' when cross-building.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25090
This commit is contained in:
Ludovic Courtès 2010-12-12 23:35:10 +00:00
parent 65e0e4dd68
commit 2ad6c9c6c2
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/top-level/all-packages.nix
View file

@ -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;