alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

GNU Hurd: Add dependency on Parted.

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

7
pkgs/os-specific/gnu/hurd/default.nix
View file

@ -1,9 +1,11 @@
{ fetchgit, stdenv, autoconf, automake, libtool, texinfo { fetchgit, stdenv, autoconf, automake, libtool, texinfo
, machHeaders, mig, headersOnly ? true , machHeaders, mig, headersOnly ? true
, cross ? null, gccCross ? null, glibcCross ? null , cross ? null, gccCross ? null, glibcCross ? null
, hurdPartedCross ? null, libuuid ? null
, buildTarget ? "all", installTarget ? "install" }: , buildTarget ? "all", installTarget ? "install" }:
assert (cross != null) -> (gccCross != null); assert (cross != null) -> (gccCross != null);
assert (hurdPartedCross != null) -> (libuuid != null);
let let
# Unfortunately we can't use `master@{DATE}', see # Unfortunately we can't use `master@{DATE}', see
@ -26,12 +28,15 @@ stdenv.mkDerivation ({
}; };
buildInputs = [ autoconf automake libtool texinfo mig ] buildInputs = [ autoconf automake libtool texinfo mig ]
++ stdenv.lib.optional (hurdPartedCross != null) hurdPartedCross
++ stdenv.lib.optional (libuuid != null) libuuid
++ stdenv.lib.optional (gccCross != null) gccCross ++ stdenv.lib.optional (gccCross != null) gccCross
++ stdenv.lib.optional (glibcCross != null) glibcCross; ++ stdenv.lib.optional (glibcCross != null) glibcCross;
propagatedBuildInputs = [ machHeaders ]; propagatedBuildInputs = [ machHeaders ];
configureFlags = stdenv.lib.optionals headersOnly [ "--build=i586-pc-gnu" ]; configureFlags = stdenv.lib.optionals headersOnly [ "--build=i586-pc-gnu" ]
++ stdenv.lib.optional (hurdPartedCross != null) [ "--with-parted" ];
preConfigure = "autoreconf -vfi"; preConfigure = "autoreconf -vfi";

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

@ -4581,7 +4581,8 @@ let
hurdCross = forceBuildDrv(import ../os-specific/gnu/hurd { hurdCross = forceBuildDrv(import ../os-specific/gnu/hurd {
inherit fetchgit stdenv autoconf libtool texinfo machHeaders inherit fetchgit stdenv autoconf libtool texinfo machHeaders
mig glibcCross; mig glibcCross hurdPartedCross;
libuuid = libuuid.hostDrv;
automake = automake111x; automake = automake111x;
headersOnly = false; headersOnly = false;
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
@ -4612,6 +4613,8 @@ let
headersOnly = true; headersOnly = true;
gccCross = null; gccCross = null;
glibcCross = null; glibcCross = null;
libuuid = null;
hurdPartedCross = null;
}; };
hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread { hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread {