From ffa5a96874e67a80ffba41a3f1316f377c4fb4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 17 Sep 2009 10:42:27 +0000 Subject: [PATCH] GNU Parted: Don't try non-Linux platforms. svn path=/nixpkgs/trunk/; revision=17226 --- pkgs/tools/misc/parted/default.nix | 6 ++++-- pkgs/tools/system/fdisk/default.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 9a4c81ce8633..f66e44b3a314 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02amqpzl8lgk247cjsbaz1nsiz9i1pbj0adx0z109h94p90i48sk"; }; - buildInputs = [ libuuid gettext readline ] ++ - stdenv.lib.optional stdenv.isLinux devicemapper; + buildInputs = [ libuuid gettext readline libuuid devicemapper ]; # XXX: For some reason our libreadline.so doesn't have libncurses as # NEEDED and `configure' links with `-Wl,--as-needed' so when @@ -44,5 +43,8 @@ stdenv.mkDerivation rec { # Add your name here! stdenv.lib.maintainers.ludo ]; + + # GNU Parted requires libuuid, which is part of e2fsprogs. + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index ed8cb8044cdb..1b9e62f5d036 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; }; }