diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-12-12 23:21:42 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-12-12 23:21:42 +0000 |
| commit | 65e0e4dd688cbf352743087facc54293b99df7fc (patch) | |
| tree | 121025c7605d353609f66d69efcda09edc1bfeab /pkgs/os-specific/gnu | |
| parent | ef8619b4b2ed2589285f543e7ae409ac8bd07405 (diff) | |
| download | nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.tar nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.tar.gz nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.tar.bz2 nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.tar.lz nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.tar.xz nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.tar.zst nixlib-65e0e4dd688cbf352743087facc54293b99df7fc.zip | |
GNU Hurd: Add dependency on Parted.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25089
Diffstat (limited to 'pkgs/os-specific/gnu')
| -rw-r--r-- | pkgs/os-specific/gnu/hurd/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index cfd88692ead4..50802d3425bf 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -1,9 +1,11 @@ { fetchgit, stdenv, autoconf, automake, libtool, texinfo , machHeaders, mig, headersOnly ? true , cross ? null, gccCross ? null, glibcCross ? null +, hurdPartedCross ? null, libuuid ? null , buildTarget ? "all", installTarget ? "install" }: assert (cross != null) -> (gccCross != null); +assert (hurdPartedCross != null) -> (libuuid != null); let # Unfortunately we can't use `master@{DATE}', see @@ -26,12 +28,15 @@ stdenv.mkDerivation ({ }; 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 (glibcCross != null) glibcCross; 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"; |